209091 2020-03-13 15:53:45 -0700 [Cocoa] Only set CF prefs direct mode for the WebContent process 2020-03-16 12:51:05 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 pvollan pvollan bfulgham commit-queue darin slewis webkit-bug-importer oldest_to_newest 1629904 0 pvollan 2020-03-13 15:53:45 -0700 Currently, we enable CF prefs direct mode in XPCServiceMain. This is incorrect, it should be enabled only in WebContentServiceInitializer. 1629905 1 pvollan 2020-03-13 15:55:28 -0700 rdar://problem/60337842 1629907 2 393548 pvollan 2020-03-13 15:57:12 -0700 Created attachment 393548 Patch 1629910 3 393548 bfulgham 2020-03-13 15:59:17 -0700 Comment on attachment 393548 Patch Ah! Yes, this is a better place for this. r=me. 1629916 4 pvollan 2020-03-13 16:10:35 -0700 (In reply to Brent Fulgham from comment #3) > Comment on attachment 393548 [details] > Patch > > Ah! Yes, this is a better place for this. r=me. Thanks for reviewing! 1629943 5 393556 pvollan 2020-03-13 16:46:06 -0700 Created attachment 393556 Patch 1630225 6 393556 darin 2020-03-15 17:34:50 -0700 Comment on attachment 393556 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393556&action=review > Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:62 > + // Enable CF prefs direct mode to avoid connecting to the CF prefs daemon. I would have written a comment more like: // Enable CFPrefs direct mode to avoid unsuccessfully attempting to connect to the daemon and getting blocked by the sandbox. 1630330 7 393655 pvollan 2020-03-16 08:47:04 -0700 Created attachment 393655 Patch 1630362 8 393657 pvollan 2020-03-16 10:16:43 -0700 Created attachment 393657 Patch 1630363 9 pvollan 2020-03-16 10:17:24 -0700 (In reply to Darin Adler from comment #6) > Comment on attachment 393556 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=393556&action=review > > > Source/WebKit/Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm:62 > > + // Enable CF prefs direct mode to avoid connecting to the CF prefs daemon. > > I would have written a comment more like: > > // Enable CFPrefs direct mode to avoid unsuccessfully attempting to > connect to the daemon and getting blocked by the sandbox. Fixed. Thanks for reviewing! 1630404 10 393657 bfulgham 2020-03-16 12:02:31 -0700 Comment on attachment 393657 Patch r=me 1630407 11 393657 pvollan 2020-03-16 12:06:28 -0700 Comment on attachment 393657 Patch Thanks for reviewing! 1630420 12 393657 commit-queue 2020-03-16 12:51:04 -0700 Comment on attachment 393657 Patch Clearing flags on attachment: 393657 Committed r258512: <https://trac.webkit.org/changeset/258512> 1630421 13 commit-queue 2020-03-16 12:51:05 -0700 All reviewed patches have been landed. Closing bug. 393548 2020-03-13 15:57:12 -0700 2020-03-16 08:47:01 -0700 Patch bug-209091-20200313155711.patch text/plain 3082 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTg0NDApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAzLTEzICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIE9ubHkgc2V0IENG IHByZWZzIGRpcmVjdCBtb2RlIGZvciB0aGUgV2ViQ29udGVudCBwcm9jZXNzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkwOTEKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzYwMzM3ODQyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgd2UgZW5hYmxlIENGIHByZWZzIGRpcmVjdCBtb2Rl IGluIFhQQ1NlcnZpY2VNYWluLiBUaGlzIGlzIGluY29ycmVjdCwgaXQgc2hvdWxkIGJlIGVuYWJs ZWQKKyAgICAgICAgb25seSBpbiBXZWJDb250ZW50U2VydmljZUluaXRpYWxpemVyLgorCisgICAg ICAgICogU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2 aWNlTWFpbi5tbToKKyAgICAgICAgKFdlYktpdDo6WFBDU2VydmljZU1haW4pOgorICAgICAgICAq IFdlYlByb2Nlc3MvRW50cnlQb2ludC9Db2NvYS9YUENTZXJ2aWNlL1dlYkNvbnRlbnRTZXJ2aWNl RW50cnlQb2ludC5tbToKKyAgICAgICAgKFdFQkNPTlRFTlRfU0VSVklDRV9JTklUSUFMSVpFUik6 CisKIDIwMjAtMDMtMTMgIEthdGUgQ2hlbmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+ CiAKICAgICAgICAgWyBpT1MgYW5kIE1hYyB3azIgXSBodHRwL3Rlc3RzL2luLWFwcC1icm93c2Vy LXByaXZhY3kvIHRlc3RzIGZhaWxpbmcKSW5kZXg6IFNvdXJjZS9XZWJLaXQvU2hhcmVkL0VudHJ5 UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2aWNlTWFpbi5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1NoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQ Q1NlcnZpY2UvWFBDU2VydmljZU1haW4ubW0JKHJldmlzaW9uIDI1ODM2MykKKysrIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2 aWNlTWFpbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMjgsNyArMjgsNiBAQAogI2ltcG9ydCAiWFBD U2VydmljZUVudHJ5UG9pbnQuaCIKIAogI2ltcG9ydCA8Q29yZUZvdW5kYXRpb24vQ29yZUZvdW5k YXRpb24uaD4KLSNpbXBvcnQgPHBhbC9zcGkvY2YvQ0ZVdGlsaXRpZXNTUEkuaD4KICNpbXBvcnQg PHd0Zi9PU09iamVjdFB0ci5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgogI2ltcG9ydCA8 d3RmL3NwaS9kYXJ3aW4vWFBDU1BJLmg+CkBAIC0xMTcsMTEgKzExNiw2IEBAIGludCBYUENTZXJ2 aWNlTWFpbihpbnQsIGNvbnN0IGNoYXIqKikKICAgICB9KTsKICNlbmRpZgogCi0jaWYgRU5BQkxF KENGUFJFRlNfRElSRUNUX01PREUpCi0gICAgLy8gRW5hYmxlIENGIHByZWZzIGRpcmVjdCBtb2Rl IHRvIGF2b2lkIGNvbm5lY3RpbmcgdG8gdGhlIENGIHByZWZzIGRhZW1vbi4KLSAgICBfQ0ZQcmVm c1NldERpcmVjdE1vZGVFbmFibGVkKFlFUyk7Ci0jZW5kaWYKLQogICAgIGlmIChib290c3RyYXAp IHsKICNpZiBQTEFURk9STShNQUMpCiAgICAgICAgIGlmIChjb25zdCBjaGFyKiB3ZWJLaXRCdW5k bGVWZXJzaW9uID0geHBjX2RpY3Rpb25hcnlfZ2V0X3N0cmluZyhib290c3RyYXAuZ2V0KCksICJX ZWJLaXRCdW5kbGVWZXJzaW9uIikpIHsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9F bnRyeVBvaW50L0NvY29hL1hQQ1NlcnZpY2UvV2ViQ29udGVudFNlcnZpY2VFbnRyeVBvaW50Lm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9FbnRyeVBvaW50L0NvY29h L1hQQ1NlcnZpY2UvV2ViQ29udGVudFNlcnZpY2VFbnRyeVBvaW50Lm1tCShyZXZpc2lvbiAyNTgz NjMpCisrKyBTb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRW50cnlQb2ludC9Db2NvYS9YUENTZXJ2 aWNlL1dlYkNvbnRlbnRTZXJ2aWNlRW50cnlQb2ludC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzAs NiArMzAsOCBAQAogI2ltcG9ydCAiV2ViUHJvY2Vzcy5oIgogI2ltcG9ydCAiWFBDU2VydmljZUVu dHJ5UG9pbnQuaCIKIAorI2ltcG9ydCA8cGFsL3NwaS9jZi9DRlV0aWxpdGllc1NQSS5oPgorCiAj aWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICNpbXBvcnQgPFdlYkNvcmUvV2ViQ29yZVRocmVhZFN5 c3RlbUludGVyZmFjZS5oPgogI2ltcG9ydCA8cGFsL3NwaS9pb3MvR3JhcGhpY3NTZXJ2aWNlc1NQ SS5oPgpAQCAtMzksNiArNDEsMTEgQEAgZXh0ZXJuICJDIiBXS19FWFBPUlQgdm9pZCBXRUJDT05U RU5UX1NFUgogCiB2b2lkIFdFQkNPTlRFTlRfU0VSVklDRV9JTklUSUFMSVpFUih4cGNfY29ubmVj dGlvbl90IGNvbm5lY3Rpb24sIHhwY19vYmplY3RfdCBpbml0aWFsaXplck1lc3NhZ2UsIHhwY19v YmplY3RfdCBwcmlvcml0eUJvb3N0TWVzc2FnZSkKIHsKKyNpZiBFTkFCTEUoQ0ZQUkVGU19ESVJF Q1RfTU9ERSkKKyAgICAvLyBFbmFibGUgQ0YgcHJlZnMgZGlyZWN0IG1vZGUgdG8gYXZvaWQgY29u bmVjdGluZyB0byB0aGUgQ0YgcHJlZnMgZGFlbW9uLgorICAgIF9DRlByZWZzU2V0RGlyZWN0TW9k ZUVuYWJsZWQoWUVTKTsKKyNlbmRpZgorCiAgICAgV1RGOjppbml0aWFsaXplTWFpblRocmVhZCgp OwogCiAgICAgLy8gUmVtb3ZlIHRoZSBXZWJQcm9jZXNzU2hpbSBmcm9tIHRoZSBEWUxEX0lOU0VS VF9MSUJSQVJJRVMgZW52aXJvbm1lbnQgdmFyaWFibGUgc28gYW55IHByb2Nlc3NlcyBzcGF3bmVk IGJ5Cg== 393556 2020-03-13 16:46:06 -0700 2020-03-16 08:47:02 -0700 Patch bug-209091-20200313164606.patch text/plain 3570 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTg0NDApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAzLTEzICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIE9ubHkgc2V0IENG IHByZWZzIGRpcmVjdCBtb2RlIGZvciB0aGUgV2ViQ29udGVudCBwcm9jZXNzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkwOTEKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzYwMzM3ODQyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgd2UgZW5hYmxlIENGIHByZWZzIGRpcmVjdCBtb2Rl IGluIFhQQ1NlcnZpY2VNYWluLiBUaGlzIGlzIGluY29ycmVjdCwgaXQgc2hvdWxkIG9ubHkgYmUg ZW5hYmxlZAorICAgICAgICBmb3IgdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKworICAgICAgICAq IFNoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZU1h aW4ubW06CisgICAgICAgIChXZWJLaXQ6OlhQQ1NlcnZpY2VNYWluKToKKwogMjAyMC0wMy0xMyAg S2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBbIGlP UyBhbmQgTWFjIHdrMiBdIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS8gdGVzdHMg ZmFpbGluZwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9D b2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2 aWNlTWFpbi5tbQkocmV2aXNpb24gMjU4MzYzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvRW50 cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC01NSwxMyArNTUsMTUgQEAgc3RhdGljIHZvaWQgWFBDU2VydmljZUV2ZW50 SGFuZGxlcih4cGNfYwogICAgICAgICAgICAgYXNzZXJ0KHR5cGUgPT0gWFBDX1RZUEVfRElDVElP TkFSWSk7CiAKICAgICAgICAgICAgIGlmICghc3RyY21wKHhwY19kaWN0aW9uYXJ5X2dldF9zdHJp bmcoZXZlbnQsICJtZXNzYWdlLW5hbWUiKSwgImJvb3RzdHJhcCIpKSB7Ci0gICAgICAgICAgICAg ICAgQ0ZCdW5kbGVSZWYgd2ViS2l0QnVuZGxlID0gQ0ZCdW5kbGVHZXRCdW5kbGVXaXRoSWRlbnRp ZmllcihDRlNUUigiY29tLmFwcGxlLldlYktpdCIpKTsKLQogICAgICAgICAgICAgICAgIGNvbnN0 IGNoYXIqIHNlcnZpY2VOYW1lID0geHBjX2RpY3Rpb25hcnlfZ2V0X3N0cmluZyhldmVudCwgInNl cnZpY2UtbmFtZSIpOwogICAgICAgICAgICAgICAgIENGU3RyaW5nUmVmIGVudHJ5UG9pbnRGdW5j dGlvbk5hbWUgPSBudWxscHRyOwotICAgICAgICAgICAgICAgIGlmIChzdHJzdHIoc2VydmljZU5h bWUsICJjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQiKSA9PSBzZXJ2aWNlTmFtZSkKKyAgICAg ICAgICAgICAgICBpZiAoc3Ryc3RyKHNlcnZpY2VOYW1lLCAiY29tLmFwcGxlLldlYktpdC5XZWJD b250ZW50IikgPT0gc2VydmljZU5hbWUpIHsKKyNpZiBFTkFCTEUoQ0ZQUkVGU19ESVJFQ1RfTU9E RSkKKyAgICAgICAgICAgICAgICAgICAgLy8gRW5hYmxlIENGIHByZWZzIGRpcmVjdCBtb2RlIHRv IGF2b2lkIGNvbm5lY3RpbmcgdG8gdGhlIENGIHByZWZzIGRhZW1vbi4KKyAgICAgICAgICAgICAg ICAgICAgX0NGUHJlZnNTZXREaXJlY3RNb2RlRW5hYmxlZChZRVMpOworI2VuZGlmCiAgICAgICAg ICAgICAgICAgICAgIGVudHJ5UG9pbnRGdW5jdGlvbk5hbWUgPSBDRlNUUihTVFJJTkdJWkVfVkFM VUVfT0YoV0VCQ09OVEVOVF9TRVJWSUNFX0lOSVRJQUxJWkVSKSk7Ci0gICAgICAgICAgICAgICAg ZWxzZSBpZiAoIXN0cmNtcChzZXJ2aWNlTmFtZSwgImNvbS5hcHBsZS5XZWJLaXQuTmV0d29ya2lu ZyIpKQorICAgICAgICAgICAgICAgIH0gZWxzZSBpZiAoIXN0cmNtcChzZXJ2aWNlTmFtZSwgImNv bS5hcHBsZS5XZWJLaXQuTmV0d29ya2luZyIpKQogICAgICAgICAgICAgICAgICAgICBlbnRyeVBv aW50RnVuY3Rpb25OYW1lID0gQ0ZTVFIoU1RSSU5HSVpFX1ZBTFVFX09GKE5FVFdPUktfU0VSVklD RV9JTklUSUFMSVpFUikpOwogICAgICAgICAgICAgICAgIGVsc2UgaWYgKCFzdHJjbXAoc2Vydmlj ZU5hbWUsICJjb20uYXBwbGUuV2ViS2l0LlBsdWdpbi42NCIpKQogICAgICAgICAgICAgICAgICAg ICBlbnRyeVBvaW50RnVuY3Rpb25OYW1lID0gQ0ZTVFIoU1RSSU5HSVpFX1ZBTFVFX09GKFBMVUdJ Tl9TRVJWSUNFX0lOSVRJQUxJWkVSKSk7CkBAIC03MCw3ICs3Miw5IEBAIHN0YXRpYyB2b2lkIFhQ Q1NlcnZpY2VFdmVudEhhbmRsZXIoeHBjX2MKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAg ICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKLSAgICAgICAgICAg ICAgICAKKworICAgICAgICAgICAgICAgIENGQnVuZGxlUmVmIHdlYktpdEJ1bmRsZSA9IENGQnVu ZGxlR2V0QnVuZGxlV2l0aElkZW50aWZpZXIoQ0ZTVFIoImNvbS5hcHBsZS5XZWJLaXQiKSk7CisK ICAgICAgICAgICAgICAgICB0eXBlZGVmIHZvaWQgKCpJbml0aWFsaXplckZ1bmN0aW9uKSh4cGNf Y29ubmVjdGlvbl90LCB4cGNfb2JqZWN0X3QsIHhwY19vYmplY3RfdCk7CiAgICAgICAgICAgICAg ICAgSW5pdGlhbGl6ZXJGdW5jdGlvbiBpbml0aWFsaXplckZ1bmN0aW9uUHRyID0gcmVpbnRlcnBy ZXRfY2FzdDxJbml0aWFsaXplckZ1bmN0aW9uPihDRkJ1bmRsZUdldEZ1bmN0aW9uUG9pbnRlckZv ck5hbWUod2ViS2l0QnVuZGxlLCBlbnRyeVBvaW50RnVuY3Rpb25OYW1lKSk7CiAgICAgICAgICAg ICAgICAgaWYgKCFpbml0aWFsaXplckZ1bmN0aW9uUHRyKSB7CkBAIC0xMTcsMTEgKzEyMSw2IEBA IGludCBYUENTZXJ2aWNlTWFpbihpbnQsIGNvbnN0IGNoYXIqKikKICAgICB9KTsKICNlbmRpZgog Ci0jaWYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01PREUpCi0gICAgLy8gRW5hYmxlIENGIHByZWZz IGRpcmVjdCBtb2RlIHRvIGF2b2lkIGNvbm5lY3RpbmcgdG8gdGhlIENGIHByZWZzIGRhZW1vbi4K LSAgICBfQ0ZQcmVmc1NldERpcmVjdE1vZGVFbmFibGVkKFlFUyk7Ci0jZW5kaWYKLQogICAgIGlm IChib290c3RyYXApIHsKICNpZiBQTEFURk9STShNQUMpCiAgICAgICAgIGlmIChjb25zdCBjaGFy KiB3ZWJLaXRCdW5kbGVWZXJzaW9uID0geHBjX2RpY3Rpb25hcnlfZ2V0X3N0cmluZyhib290c3Ry YXAuZ2V0KCksICJXZWJLaXRCdW5kbGVWZXJzaW9uIikpIHsK 393655 2020-03-16 08:47:04 -0700 2020-03-16 10:16:42 -0700 Patch bug-209091-20200316084703.patch text/plain 2808 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTg0NDApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAzLTEzICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIE9ubHkgc2V0IENG IHByZWZzIGRpcmVjdCBtb2RlIGZvciB0aGUgV2ViQ29udGVudCBwcm9jZXNzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkwOTEKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzYwMzM3ODQyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgd2UgZW5hYmxlIENGIHByZWZzIGRpcmVjdCBtb2Rl IGluIFhQQ1NlcnZpY2VNYWluLiBUaGlzIGlzIGluY29ycmVjdCwgaXQgc2hvdWxkIG9ubHkgYmUg ZW5hYmxlZAorICAgICAgICBmb3IgdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKworICAgICAgICAq IFNoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZU1h aW4ubW06CisgICAgICAgIChXZWJLaXQ6OlhQQ1NlcnZpY2VNYWluKToKKwogMjAyMC0wMy0xMyAg S2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBbIGlP UyBhbmQgTWFjIHdrMiBdIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS8gdGVzdHMg ZmFpbGluZwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9D b2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2 aWNlTWFpbi5tbQkocmV2aXNpb24gMjU4MzYzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvRW50 cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC03MCw3ICs3MCw2IEBAIHN0YXRpYyB2b2lkIFhQQ1NlcnZpY2VFdmVudEhh bmRsZXIoeHBjX2MKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIFJF TEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKLSAgICAgICAgICAgICAgICAKICAgICAgICAg ICAgICAgICB0eXBlZGVmIHZvaWQgKCpJbml0aWFsaXplckZ1bmN0aW9uKSh4cGNfY29ubmVjdGlv bl90LCB4cGNfb2JqZWN0X3QsIHhwY19vYmplY3RfdCk7CiAgICAgICAgICAgICAgICAgSW5pdGlh bGl6ZXJGdW5jdGlvbiBpbml0aWFsaXplckZ1bmN0aW9uUHRyID0gcmVpbnRlcnByZXRfY2FzdDxJ bml0aWFsaXplckZ1bmN0aW9uPihDRkJ1bmRsZUdldEZ1bmN0aW9uUG9pbnRlckZvck5hbWUod2Vi S2l0QnVuZGxlLCBlbnRyeVBvaW50RnVuY3Rpb25OYW1lKSk7CiAgICAgICAgICAgICAgICAgaWYg KCFpbml0aWFsaXplckZ1bmN0aW9uUHRyKSB7CkBAIC0xMDYsOCArMTA1LDE3IEBAIHN0YXRpYyB2 b2lkIFhQQ1NlcnZpY2VFdmVudEhhbmRsZXIoeHBjX2MKICAgICB4cGNfY29ubmVjdGlvbl9yZXN1 bWUocGVlcik7CiB9CiAKLWludCBYUENTZXJ2aWNlTWFpbihpbnQsIGNvbnN0IGNoYXIqKikKK2lu dCBYUENTZXJ2aWNlTWFpbihpbnQgYXJnYywgY29uc3QgY2hhcioqIGFyZ3YpCiB7CisgICAgQVNT RVJUKGFyZ2MgPj0gMSk7CisgICAgQVNTRVJUKGFyZ3ZbMF0pOworI2lmIEVOQUJMRShDRlBSRUZT X0RJUkVDVF9NT0RFKQorICAgIGlmIChhcmdjID49IDEgJiYgYXJndlswXSAmJiBzdHJzdHIoYXJn dlswXSwgImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCIpKSB7CisgICAgICAgIC8vIEVuYWJs ZSBDRiBwcmVmcyBkaXJlY3QgbW9kZSBpbnQgdGhlIFdlYkNvbnRlbnQgcHJvY2VzcyB0byBhdm9p ZCBjb25uZWN0aW5nIHRvIHRoZSBDRiBwcmVmcyBkYWVtb24uCisgICAgICAgIF9DRlByZWZzU2V0 RGlyZWN0TW9kZUVuYWJsZWQoWUVTKTsKKyAgICB9CisjZW5kaWYKKwogICAgIGF1dG8gYm9vdHN0 cmFwID0gYWRvcHRPU09iamVjdCh4cGNfY29weV9ib290c3RyYXAoKSk7CiAjaWYgUExBVEZPUk0o SU9TX0ZBTUlMWSkKICAgICBhdXRvIGNvbnRhaW5lckVudmlyb25tZW50VmFyaWFibGVzID0geHBj X2RpY3Rpb25hcnlfZ2V0X3ZhbHVlKGJvb3RzdHJhcC5nZXQoKSwgIkNvbnRhaW5lckVudmlyb25t ZW50VmFyaWFibGVzIik7CkBAIC0xMTcsMTEgKzEyNSw2IEBAIGludCBYUENTZXJ2aWNlTWFpbihp bnQsIGNvbnN0IGNoYXIqKikKICAgICB9KTsKICNlbmRpZgogCi0jaWYgRU5BQkxFKENGUFJFRlNf RElSRUNUX01PREUpCi0gICAgLy8gRW5hYmxlIENGIHByZWZzIGRpcmVjdCBtb2RlIHRvIGF2b2lk IGNvbm5lY3RpbmcgdG8gdGhlIENGIHByZWZzIGRhZW1vbi4KLSAgICBfQ0ZQcmVmc1NldERpcmVj dE1vZGVFbmFibGVkKFlFUyk7Ci0jZW5kaWYKLQogICAgIGlmIChib290c3RyYXApIHsKICNpZiBQ TEFURk9STShNQUMpCiAgICAgICAgIGlmIChjb25zdCBjaGFyKiB3ZWJLaXRCdW5kbGVWZXJzaW9u ID0geHBjX2RpY3Rpb25hcnlfZ2V0X3N0cmluZyhib290c3RyYXAuZ2V0KCksICJXZWJLaXRCdW5k bGVWZXJzaW9uIikpIHsK 393657 2020-03-16 10:16:43 -0700 2020-03-16 12:51:04 -0700 Patch bug-209091-20200316101642.patch text/plain 2832 pvollan SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTg0NDApCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTAzLTEzICBQZXIgQXJuZSBW b2xsYW4gIDxwdm9sbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29jb2FdIE9ubHkgc2V0IENG IHByZWZzIGRpcmVjdCBtb2RlIGZvciB0aGUgV2ViQ29udGVudCBwcm9jZXNzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDkwOTEKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzYwMzM3ODQyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgd2UgZW5hYmxlIENGIHByZWZzIGRpcmVjdCBtb2Rl IGluIFhQQ1NlcnZpY2VNYWluLiBUaGlzIGlzIGluY29ycmVjdCwgaXQgc2hvdWxkIG9ubHkgYmUg ZW5hYmxlZAorICAgICAgICBmb3IgdGhlIFdlYkNvbnRlbnQgcHJvY2Vzcy4KKworICAgICAgICAq IFNoYXJlZC9FbnRyeVBvaW50VXRpbGl0aWVzL0NvY29hL1hQQ1NlcnZpY2UvWFBDU2VydmljZU1h aW4ubW06CisgICAgICAgIChXZWJLaXQ6OlhQQ1NlcnZpY2VNYWluKToKKwogMjAyMC0wMy0xMyAg S2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAogICAgICAgICBbIGlP UyBhbmQgTWFjIHdrMiBdIGh0dHAvdGVzdHMvaW4tYXBwLWJyb3dzZXItcHJpdmFjeS8gdGVzdHMg ZmFpbGluZwpJbmRleDogU291cmNlL1dlYktpdC9TaGFyZWQvRW50cnlQb2ludFV0aWxpdGllcy9D b2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvU2hhcmVkL0VudHJ5UG9pbnRVdGlsaXRpZXMvQ29jb2EvWFBDU2VydmljZS9YUENTZXJ2 aWNlTWFpbi5tbQkocmV2aXNpb24gMjU4MzYzKQorKysgU291cmNlL1dlYktpdC9TaGFyZWQvRW50 cnlQb2ludFV0aWxpdGllcy9Db2NvYS9YUENTZXJ2aWNlL1hQQ1NlcnZpY2VNYWluLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC03MCw3ICs3MCw2IEBAIHN0YXRpYyB2b2lkIFhQQ1NlcnZpY2VFdmVudEhh bmRsZXIoeHBjX2MKICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgICAgIFJF TEVBU0VfQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAKLSAgICAgICAgICAgICAgICAKICAgICAgICAg ICAgICAgICB0eXBlZGVmIHZvaWQgKCpJbml0aWFsaXplckZ1bmN0aW9uKSh4cGNfY29ubmVjdGlv bl90LCB4cGNfb2JqZWN0X3QsIHhwY19vYmplY3RfdCk7CiAgICAgICAgICAgICAgICAgSW5pdGlh bGl6ZXJGdW5jdGlvbiBpbml0aWFsaXplckZ1bmN0aW9uUHRyID0gcmVpbnRlcnByZXRfY2FzdDxJ bml0aWFsaXplckZ1bmN0aW9uPihDRkJ1bmRsZUdldEZ1bmN0aW9uUG9pbnRlckZvck5hbWUod2Vi S2l0QnVuZGxlLCBlbnRyeVBvaW50RnVuY3Rpb25OYW1lKSk7CiAgICAgICAgICAgICAgICAgaWYg KCFpbml0aWFsaXplckZ1bmN0aW9uUHRyKSB7CkBAIC0xMDYsOCArMTA1LDE3IEBAIHN0YXRpYyB2 b2lkIFhQQ1NlcnZpY2VFdmVudEhhbmRsZXIoeHBjX2MKICAgICB4cGNfY29ubmVjdGlvbl9yZXN1 bWUocGVlcik7CiB9CiAKLWludCBYUENTZXJ2aWNlTWFpbihpbnQsIGNvbnN0IGNoYXIqKikKK2lu dCBYUENTZXJ2aWNlTWFpbihpbnQgYXJnYywgY29uc3QgY2hhcioqIGFyZ3YpCiB7CisgICAgQVNT RVJUKGFyZ2MgPj0gMSk7CisgICAgQVNTRVJUKGFyZ3ZbMF0pOworI2lmIEVOQUJMRShDRlBSRUZT X0RJUkVDVF9NT0RFKQorICAgIGlmIChhcmdjID49IDEgJiYgYXJndlswXSAmJiBzdHJzdHIoYXJn dlswXSwgImNvbS5hcHBsZS5XZWJLaXQuV2ViQ29udGVudCIpKSB7CisgICAgICAgIC8vIEVuYWJs ZSBDRlByZWZzIGRpcmVjdCBtb2RlIHRvIGF2b2lkIHVuc3VjY2Vzc2Z1bGx5IGF0dGVtcHRpbmcg dG8gY29ubmVjdCB0byB0aGUgZGFlbW9uIGFuZCBnZXR0aW5nIGJsb2NrZWQgYnkgdGhlIHNhbmRi b3guCisgICAgICAgIF9DRlByZWZzU2V0RGlyZWN0TW9kZUVuYWJsZWQoWUVTKTsKKyAgICB9Cisj ZW5kaWYKKwogICAgIGF1dG8gYm9vdHN0cmFwID0gYWRvcHRPU09iamVjdCh4cGNfY29weV9ib290 c3RyYXAoKSk7CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBhdXRvIGNvbnRhaW5lckVu dmlyb25tZW50VmFyaWFibGVzID0geHBjX2RpY3Rpb25hcnlfZ2V0X3ZhbHVlKGJvb3RzdHJhcC5n ZXQoKSwgIkNvbnRhaW5lckVudmlyb25tZW50VmFyaWFibGVzIik7CkBAIC0xMTcsMTEgKzEyNSw2 IEBAIGludCBYUENTZXJ2aWNlTWFpbihpbnQsIGNvbnN0IGNoYXIqKikKICAgICB9KTsKICNlbmRp ZgogCi0jaWYgRU5BQkxFKENGUFJFRlNfRElSRUNUX01PREUpCi0gICAgLy8gRW5hYmxlIENGIHBy ZWZzIGRpcmVjdCBtb2RlIHRvIGF2b2lkIGNvbm5lY3RpbmcgdG8gdGhlIENGIHByZWZzIGRhZW1v bi4KLSAgICBfQ0ZQcmVmc1NldERpcmVjdE1vZGVFbmFibGVkKFlFUyk7Ci0jZW5kaWYKLQogICAg IGlmIChib290c3RyYXApIHsKICNpZiBQTEFURk9STShNQUMpCiAgICAgICAgIGlmIChjb25zdCBj aGFyKiB3ZWJLaXRCdW5kbGVWZXJzaW9uID0geHBjX2RpY3Rpb25hcnlfZ2V0X3N0cmluZyhib290 c3RyYXAuZ2V0KCksICJXZWJLaXRCdW5kbGVWZXJzaW9uIikpIHsK