203809 2019-11-04 06:37:04 -0800 REGRESSION(r243947) Epson software updater fails to install new version 2019-11-04 10:59:54 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen beidson commit-queue ggaren webkit-bug-importer oldest_to_newest 1586966 0 achristensen 2019-11-04 06:37:04 -0800 REGRESSION(r243947) Epson software updater fails to install new version 1586967 1 382735 achristensen 2019-11-04 06:38:35 -0800 Created attachment 382735 Patch 1586968 2 achristensen 2019-11-04 06:38:40 -0800 <rdar://problem/56002179> 1587010 3 382742 achristensen 2019-11-04 08:48:38 -0800 Created attachment 382742 Patch 1587014 4 382742 beidson 2019-11-04 09:01:31 -0800 Comment on attachment 382742 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382742&action=review > Source/WebKitLegacy/mac/Misc/WebDownload.mm:122 > + if (isDelegateThread()) Is there any reason we even have "isDelegateThread"? Couldn't we just always use "callOnDelegateThread"? Even the forms of this that need a sync return value should be able to work with that, right? 1587020 5 382742 achristensen 2019-11-04 09:19:02 -0800 Comment on attachment 382742 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382742&action=review >> Source/WebKitLegacy/mac/Misc/WebDownload.mm:122 >> + if (isDelegateThread()) > > Is there any reason we even have "isDelegateThread"? > > Couldn't we just always use "callOnDelegateThread"? > > Even the forms of this that need a sync return value should be able to work with that, right? We would need callOnDelegateThread and callOnDelegateThreadAndWait. Do you think that would be better? 1587022 6 beidson 2019-11-04 09:23:27 -0800 (In reply to Alex Christensen from comment #5) > Comment on attachment 382742 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=382742&action=review > > >> Source/WebKitLegacy/mac/Misc/WebDownload.mm:122 > >> + if (isDelegateThread()) > > > > Is there any reason we even have "isDelegateThread"? > > > > Couldn't we just always use "callOnDelegateThread"? > > > > Even the forms of this that need a sync return value should be able to work with that, right? > > We would need callOnDelegateThread and callOnDelegateThreadAndWait. Do you > think that would be better? Oh, I was (incorrectly) thinking the sync behavior was managed through a local variable of some sort. I think it'd be better. It would clean up every single call site into two methods with the complexity. 1587025 7 382746 achristensen 2019-11-04 09:33:50 -0800 Created attachment 382746 Patch 1587026 8 382746 beidson 2019-11-04 09:34:49 -0800 Comment on attachment 382746 Patch I think this is much better. 1587042 9 382746 commit-queue 2019-11-04 10:21:03 -0800 Comment on attachment 382746 Patch Clearing flags on attachment: 382746 Committed r252000: <https://trac.webkit.org/changeset/252000> 1587043 10 commit-queue 2019-11-04 10:21:05 -0800 All reviewed patches have been landed. Closing bug. 1587059 11 382746 ggaren 2019-11-04 10:59:54 -0800 Comment on attachment 382746 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=382746&action=review > Source/WebKitLegacy/mac/Misc/WebDownload.mm:50 > + static bool isOldEpsonSoftwareUpdater = WebCore::MacApplication::isEpsonSoftwareUpdater() && dyld_get_program_sdk_version() < DYLD_MACOSX_VERSION_10_15; > + return isOldEpsonSoftwareUpdater; Even though this is LegacyWebKit code, which technically works with dyld_get_program_sdk_version(), it's better style to use applicationSDKVersion(), which works for LegacyWebKit and WebKit. 382735 2019-11-04 06:38:35 -0800 2019-11-04 08:48:34 -0800 Patch bug-203809-20191104143833.patch text/plain 9447 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MTk4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE5LTExLTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lP TihyMjQzOTQ3KSBFcHNvbiBzb2Z0d2FyZSB1cGRhdGVyIGZhaWxzIHRvIGluc3RhbGwgbmV3IHZl cnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw MzgwOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYwMDIxNzk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBtYW51YWxseSB2ZXJpZmllZCB0aGlz IGZpeGVzIHRoZSBpc3N1ZS4gIFNlZSB0aGUgcmFkYXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9S dW50aW1lQXBwbGljYXRpb25DaGVja3MuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9SdW50 aW1lQXBwbGljYXRpb25DaGVja3NDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1hY0FwcGxp Y2F0aW9uOjppc0Vwc29uU29mdHdhcmVVcGRhdGVyKToKKwogMjAxOS0xMS0wMyAgWmFsYW4gQnVq dGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1ZlcmlmaWNhdGlvbl0gRm9y Y2VkIGxpbmUgYnJlYWsgZGlzcGxheSBydW5zIGRvbid0IGhhdmUgVGV4dENvbnRleHQKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNr cy5oCShyZXZpc2lvbiAyNTE5ODApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1l QXBwbGljYXRpb25DaGVja3MuaAkod29ya2luZyBjb3B5KQpAQCAtNjgsNiArNjgsNyBAQCBib29s IGlzU29saWRTdGF0ZU5ldHdvcmtzRG93bmxvYWRlcigpOwogV0VCQ09SRV9FWFBPUlQgYm9vbCBp c1ZlcnNpb25zKCk7CiBXRUJDT1JFX0VYUE9SVCBib29sIGlzSFJCbG9jaygpOwogV0VCQ09SRV9F WFBPUlQgYm9vbCBpc0lBZFByb2R1Y2VyKCk7CitXRUJDT1JFX0VYUE9SVCBib29sIGlzRXBzb25T b2Z0d2FyZVVwZGF0ZXIoKTsKIAogfSAvLyBNYWNBcHBsaWNhdGlvbgogCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NDb2NvYS5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9SdW50aW1lQXBwbGlj YXRpb25DaGVja3NDb2NvYS5tbQkocmV2aXNpb24gMjUxOTgwKQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EubW0JKHdvcmtpbmcg Y29weSkKQEAgLTE5Myw2ICsxOTMsMTIgQEAgYm9vbCBNYWNBcHBsaWNhdGlvbjo6aXNTb2xpZFN0 YXRlTmV0d29yawogICAgIHJldHVybiBpc1NvbGlkU3RhdGVOZXR3b3Jrc0Rvd25sb2FkZXI7CiB9 CiAKK2Jvb2wgTWFjQXBwbGljYXRpb246OmlzRXBzb25Tb2Z0d2FyZVVwZGF0ZXIoKQoreworICAg IHN0YXRpYyBib29sIGlzRXBzb25Tb2Z0d2FyZVVwZGF0ZXIgPSBhcHBsaWNhdGlvbkJ1bmRsZUlz RXF1YWxUbygiY29tLmVwc29uLkVQU09OX1NvZnR3YXJlX1VwZGF0ZXIiX3MpOworICAgIHJldHVy biBpc0Vwc29uU29mdHdhcmVVcGRhdGVyOworfQorCiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQog CiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VM b2cJKHJldmlzaW9uIDI1MTk4NykKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE5LTExLTA0ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihy MjQzOTQ3KSBFcHNvbiBzb2Z0d2FyZSB1cGRhdGVyIGZhaWxzIHRvIGluc3RhbGwgbmV3IHZlcnNp b24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzgw OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYwMDIxNzk+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBNaXNjL1dlYkRvd25sb2FkLm1tOgorICAg ICAgICAoc2hvdWxkQ2FsbE9uTmV0d29ya1RocmVhZCk6CisgICAgICAgIChjYWxsT25EZWxlZ2F0 ZVRocmVhZCk6CisgICAgICAgIChpc0RlbGVnYXRlVGhyZWFkKToKKyAgICAgICAgKC1bV2ViRG93 bmxvYWRJbnRlcm5hbCBkb3dubG9hZERpZEJlZ2luOl0pOgorICAgICAgICAoLVtXZWJEb3dubG9h ZEludGVybmFsIGRvd25sb2FkOndpbGxTZW5kUmVxdWVzdDpyZWRpcmVjdFJlc3BvbnNlOl0pOgor ICAgICAgICAoLVtXZWJEb3dubG9hZEludGVybmFsIGRvd25sb2FkOmRpZFJlY2VpdmVBdXRoZW50 aWNhdGlvbkNoYWxsZW5nZTpdKToKKyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3du bG9hZDpkaWRSZWNlaXZlUmVzcG9uc2U6XSk6CisgICAgICAgICgtW1dlYkRvd25sb2FkSW50ZXJu YWwgZG93bmxvYWQ6ZGlkUmVjZWl2ZURhdGFPZkxlbmd0aDpdKToKKyAgICAgICAgKC1bV2ViRG93 bmxvYWRJbnRlcm5hbCBkb3dubG9hZDpzaG91bGREZWNvZGVTb3VyY2VEYXRhT2ZNSU1FVHlwZTpd KToKKyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3dubG9hZDpkZWNpZGVEZXN0aW5h dGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFtZTpdKToKKyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRl cm5hbCBkb3dubG9hZDpkaWRDcmVhdGVEZXN0aW5hdGlvbjpdKToKKyAgICAgICAgKC1bV2ViRG93 bmxvYWRJbnRlcm5hbCBkb3dubG9hZERpZEZpbmlzaDpdKToKKyAgICAgICAgKC1bV2ViRG93bmxv YWRJbnRlcm5hbCBkb3dubG9hZDpkaWRGYWlsV2l0aEVycm9yOl0pOgorCiAyMDE5LTExLTAyICBE ZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBBZGQgZGlhZ25vc3RpYyBsb2dnaW5nIGZvciBmcm9udGVuZCBmZWF0dXJlIHVzYWdlCkluZGV4 OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9NaXNjL1dlYkRvd25sb2FkLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL01pc2MvV2ViRG93bmxvYWQubW0JKHJldmlzaW9u IDI1MTk4MCkKKysrIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL01pc2MvV2ViRG93bmxvYWQubW0J KHdvcmtpbmcgY29weSkKQEAgLTM2LDEwICszNiwzMCBAQAogI2ltcG9ydCA8V2ViQ29yZS9DcmVk ZW50aWFsU3RvcmFnZS5oPgogI2ltcG9ydCA8V2ViQ29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24u aD4KICNpbXBvcnQgPFdlYkNvcmUvUHJvdGVjdGlvblNwYWNlLmg+CisjaW1wb3J0IDxXZWJDb3Jl L1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oPgogI2ltcG9ydCA8V2ViS2l0TGVnYWN5L1dlYlBh bmVsQXV0aGVudGljYXRpb25IYW5kbGVyLmg+CiAjaW1wb3J0IDxwYWwvc3BpL2NvY29hL05TVVJM RG93bmxvYWRTUEkuaD4KICNpbXBvcnQgPHd0Zi9Bc3NlcnRpb25zLmg+CiAjaW1wb3J0IDx3dGYv TWFpblRocmVhZC5oPgorI2ltcG9ydCA8d3RmL3NwaS9kYXJ3aW4vZHlsZFNQSS5oPgorCitzdGF0 aWMgYm9vbCBzaG91bGRDYWxsT25OZXR3b3JrVGhyZWFkKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBp c09sZEVwc29uU29mdHdhcmVVcGRhdGVyID0gV2ViQ29yZTo6TWFjQXBwbGljYXRpb246OmlzRXBz b25Tb2Z0d2FyZVVwZGF0ZXIoKSAmJiBkeWxkX2dldF9wcm9ncmFtX3Nka192ZXJzaW9uKCkgPCBE WUxEX01BQ09TWF9WRVJTSU9OXzEwXzE1OworICAgIHJldHVybiBpc09sZEVwc29uU29mdHdhcmVV cGRhdGVyOworfQorCitzdGF0aWMgdm9pZCBjYWxsT25EZWxlZ2F0ZVRocmVhZChGdW5jdGlvbjx2 b2lkKCk+JiYgZnVuY3Rpb24pCit7CisgICAgaWYgKHNob3VsZENhbGxPbk5ldHdvcmtUaHJlYWQo KSkKKyAgICAgICAgZnVuY3Rpb24oKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFdURk1vdmUoZnVu Y3Rpb24pKTsKK30KKworc3RhdGljIGJvb2wgaXNEZWxlZ2F0ZVRocmVhZCgpCit7CisgICAgcmV0 dXJuIHNob3VsZENhbGxPbk5ldHdvcmtUaHJlYWQoKSB8fCBpc01haW5UaHJlYWQoKTsKK30KIAog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTgzLDcgKzEwMyw3IEBAIC0gKEJPT0wpcmVz cG9uZHNUb1NlbGVjdG9yOihTRUwpc2VsZWN0b3IKIAogLSAodm9pZClkb3dubG9hZERpZEJlZ2lu OihOU1VSTERvd25sb2FkICopZG93bmxvYWQKIHsKLSAgICBjYWxsT25NYWluVGhyZWFkKFtyZWFs RGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIo ZG93bmxvYWQpXSB7CisgICAgY2FsbE9uRGVsZWdhdGVUaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJl dGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCldIHsK ICAgICAgICAgW3JlYWxEZWxlZ2F0ZSBkb3dubG9hZERpZEJlZ2luOmRvd25sb2FkLmdldCgpXTsK ICAgICB9KTsKIH0KQEAgLTk1LDcgKzExNSw3IEBAIC0gKE5TVVJMUmVxdWVzdCAqKWRvd25sb2Fk OihOU1VSTERvd25sb2EKICAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICAgICAg cmV0dXJuVmFsdWUgPSBbcmVhbERlbGVnYXRlIGRvd25sb2FkOmRvd25sb2FkIHdpbGxTZW5kUmVx dWVzdDpyZXF1ZXN0IHJlZGlyZWN0UmVzcG9uc2U6cmVkaXJlY3RSZXNwb25zZV07CiAgICAgfTsK LSAgICBpZiAoaXNNYWluVGhyZWFkKCkpCisgICAgaWYgKGlzRGVsZWdhdGVUaHJlYWQoKSkKICAg ICAgICAgd29yaygpOwogICAgIGVsc2UKICAgICAgICAgZGlzcGF0Y2hfc3luYyhkaXNwYXRjaF9n ZXRfbWFpbl9xdWV1ZSgpLCB3b3JrKTsKQEAgLTExNSwxMSArMTM1LDExIEBAIC0gKHZvaWQpZG93 bmxvYWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG8KICAgICB9CiAKICAgICBpZiAoW3JlYWxEZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGRvd25sb2FkOmRpZFJlY2VpdmVBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZTopXSkgewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtyZWFs RGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIo ZG93bmxvYWQpLCBjaGFsbGVuZ2UgPSByZXRhaW5QdHIoY2hhbGxlbmdlKV0geworICAgICAgICBj YWxsT25EZWxlZ2F0ZVRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0 ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKSwgY2hhbGxlbmdlID0gcmV0YWluUHRy KGNoYWxsZW5nZSldIHsKICAgICAgICAgICAgIFtyZWFsRGVsZWdhdGUgZG93bmxvYWQ6ZG93bmxv YWQuZ2V0KCkgZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOmNoYWxsZW5nZS5nZXQo KV07CiAgICAgICAgIH0pOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGNhbGxPbk1haW5UaHJlYWQo W3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFp blB0cihkb3dubG9hZCksIGNoYWxsZW5nZSA9IHJldGFpblB0cihjaGFsbGVuZ2UpXSB7CisgICAg ICAgIGNhbGxPbkRlbGVnYXRlVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERl bGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQpLCBjaGFsbGVuZ2UgPSByZXRh aW5QdHIoY2hhbGxlbmdlKV0gewogICAgICAgICAgICAgTlNXaW5kb3cgKndpbmRvdyA9IG5pbDsK ICAgICAgICAgICAgIGlmIChbcmVhbERlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3IoZG93bmxvYWRXaW5kb3dGb3JBdXRoZW50aWNhdGlvblNoZWV0OildKQogICAgICAgICAgICAg ICAgIHdpbmRvdyA9IFtyZWFsRGVsZWdhdGUgZG93bmxvYWRXaW5kb3dGb3JBdXRoZW50aWNhdGlv blNoZWV0OihXZWJEb3dubG9hZCAqKWRvd25sb2FkLmdldCgpXTsKQEAgLTEzMiwxNCArMTUyLDE0 IEBAIC0gKHZvaWQpZG93bmxvYWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG8KIAogLSAodm9pZClk b3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRvd25sb2FkIGRpZFJlY2VpdmVSZXNwb25zZTooTlNV UkxSZXNwb25zZSAqKXJlc3BvbnNlCiB7Ci0gICAgY2FsbE9uTWFpblRocmVhZChbcmVhbERlbGVn YXRlID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25s b2FkKSwgcmVzcG9uc2UgPSByZXRhaW5QdHIocmVzcG9uc2UpXSB7CisgICAgY2FsbE9uRGVsZWdh dGVUaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9h ZCA9IHJldGFpblB0cihkb3dubG9hZCksIHJlc3BvbnNlID0gcmV0YWluUHRyKHJlc3BvbnNlKV0g ewogICAgICAgICBbcmVhbERlbGVnYXRlIGRvd25sb2FkOmRvd25sb2FkLmdldCgpIGRpZFJlY2Vp dmVSZXNwb25zZTpyZXNwb25zZS5nZXQoKV07CiAgICAgfSk7CiB9CiAKIC0gKHZvaWQpZG93bmxv YWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG9hZCBkaWRSZWNlaXZlRGF0YU9mTGVuZ3RoOihOU1VJ bnRlZ2VyKWxlbmd0aAogewotICAgIGNhbGxPbk1haW5UaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJl dGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCksIGxl bmd0aF0geworICAgIGNhbGxPbkRlbGVnYXRlVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5Q dHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQpLCBsZW5ndGhd IHsKICAgICAgICAgW3JlYWxEZWxlZ2F0ZSBkb3dubG9hZDpkb3dubG9hZC5nZXQoKSBkaWRSZWNl aXZlRGF0YU9mTGVuZ3RoOmxlbmd0aF07CiAgICAgfSk7CiB9CkBAIC0xNTAsNyArMTcwLDcgQEAg LSAoQk9PTClkb3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRvd25sbwogICAgIGF1dG8gd29yayA9 IFsmXSB7CiAgICAgICAgIHJldHVyblZhbHVlID0gW3JlYWxEZWxlZ2F0ZSBkb3dubG9hZDpkb3du bG9hZCBzaG91bGREZWNvZGVTb3VyY2VEYXRhT2ZNSU1FVHlwZTplbmNvZGluZ1R5cGVdOwogICAg IH07Ci0gICAgaWYgKGlzTWFpblRocmVhZCgpKQorICAgIGlmIChpc0RlbGVnYXRlVGhyZWFkKCkp CiAgICAgICAgIHdvcmsoKTsKICAgICBlbHNlCiAgICAgICAgIGRpc3BhdGNoX3N5bmMoZGlzcGF0 Y2hfZ2V0X21haW5fcXVldWUoKSwgd29yayk7CkBAIC0xNTksMjggKzE3OSwyOCBAQCAtIChCT09M KWRvd25sb2FkOihOU1VSTERvd25sb2FkICopZG93bmxvCiAKIC0gKHZvaWQpZG93bmxvYWQ6KE5T VVJMRG93bmxvYWQgKilkb3dubG9hZCBkZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxl bmFtZTooTlNTdHJpbmcgKilmaWxlbmFtZQogewotICAgIGNhbGxPbk1haW5UaHJlYWQoW3JlYWxE ZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihk b3dubG9hZCksIGZpbGVuYW1lID0gcmV0YWluUHRyKGZpbGVuYW1lKV0geworICAgIGNhbGxPbkRl bGVnYXRlVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93 bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQpLCBmaWxlbmFtZSA9IHJldGFpblB0cihmaWxlbmFt ZSldIHsKICAgICAgICAgW3JlYWxEZWxlZ2F0ZSBkb3dubG9hZDpkb3dubG9hZC5nZXQoKSBkZWNp ZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFtZTpmaWxlbmFtZS5nZXQoKV07CiAgICAg fSk7CiB9CiAKIC0gKHZvaWQpZG93bmxvYWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG9hZCBkaWRD cmVhdGVEZXN0aW5hdGlvbjooTlNTdHJpbmcgKilwYXRoCiB7Ci0gICAgY2FsbE9uTWFpblRocmVh ZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0gcmV0 YWluUHRyKGRvd25sb2FkKSwgcGF0aCA9IHJldGFpblB0cihwYXRoKV0geworICAgIGNhbGxPbkRl bGVnYXRlVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93 bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQpLCBwYXRoID0gcmV0YWluUHRyKHBhdGgpXSB7CiAg ICAgICAgIFtyZWFsRGVsZWdhdGUgZG93bmxvYWQ6ZG93bmxvYWQuZ2V0KCkgZGlkQ3JlYXRlRGVz dGluYXRpb246cGF0aC5nZXQoKV07CiAgICAgfSk7CiB9CiAKIC0gKHZvaWQpZG93bmxvYWREaWRG aW5pc2g6KE5TVVJMRG93bmxvYWQgKilkb3dubG9hZAogewotICAgIGNhbGxPbk1haW5UaHJlYWQo W3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFp blB0cihkb3dubG9hZCldIHsKKyAgICBjYWxsT25EZWxlZ2F0ZVRocmVhZChbcmVhbERlbGVnYXRl ID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2Fk KV0gewogICAgICAgICBbcmVhbERlbGVnYXRlIGRvd25sb2FkRGlkRmluaXNoOmRvd25sb2FkLmdl dCgpXTsKICAgICB9KTsKIH0KIAogLSAodm9pZClkb3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRv d25sb2FkIGRpZEZhaWxXaXRoRXJyb3I6KE5TRXJyb3IgKillcnJvcgogewotICAgIGNhbGxPbk1h aW5UaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9h ZCA9IHJldGFpblB0cihkb3dubG9hZCksIGVycm9yID0gcmV0YWluUHRyKGVycm9yKV0geworICAg IGNhbGxPbkRlbGVnYXRlVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVn YXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQpLCBlcnJvciA9IHJldGFpblB0cihl cnJvcildIHsKICAgICAgICAgW3JlYWxEZWxlZ2F0ZSBkb3dubG9hZDpkb3dubG9hZC5nZXQoKSBk aWRGYWlsV2l0aEVycm9yOmVycm9yLmdldCgpXTsKICAgICB9KTsKIH0K 382742 2019-11-04 08:48:38 -0800 2019-11-04 09:33:46 -0800 Patch bug-203809-20191104164836.patch text/plain 9527 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MTk4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE5LTExLTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lP TihyMjQzOTQ3KSBFcHNvbiBzb2Z0d2FyZSB1cGRhdGVyIGZhaWxzIHRvIGluc3RhbGwgbmV3IHZl cnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw MzgwOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYwMDIxNzk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSSBtYW51YWxseSB2ZXJpZmllZCB0aGlz IGZpeGVzIHRoZSBpc3N1ZS4gIFNlZSB0aGUgcmFkYXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9S dW50aW1lQXBwbGljYXRpb25DaGVja3MuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9SdW50 aW1lQXBwbGljYXRpb25DaGVja3NDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1hY0FwcGxp Y2F0aW9uOjppc0Vwc29uU29mdHdhcmVVcGRhdGVyKToKKwogMjAxOS0xMS0wNCAgeW91ZW5uIGZh YmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgT3JkZXIgb2YgcG9zdE1lc3NhZ2Ug YW5kIGZldGNoIGV2ZW50cyBzaG91bGQgYmUgcHJlc2VydmVkIHdoZW4gZ29pbmcgZnJvbSBjbGll bnQgdG8gc2VydmljZSB3b3JrZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1J1bnRp bWVBcHBsaWNhdGlvbkNoZWNrcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oCShyZXZpc2lvbiAyNTE5ODApCisrKyBTb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaAkod29ya2luZyBj b3B5KQpAQCAtNjgsNiArNjgsNyBAQCBib29sIGlzU29saWRTdGF0ZU5ldHdvcmtzRG93bmxvYWRl cigpOwogV0VCQ09SRV9FWFBPUlQgYm9vbCBpc1ZlcnNpb25zKCk7CiBXRUJDT1JFX0VYUE9SVCBi b29sIGlzSFJCbG9jaygpOwogV0VCQ09SRV9FWFBPUlQgYm9vbCBpc0lBZFByb2R1Y2VyKCk7CitX RUJDT1JFX0VYUE9SVCBib29sIGlzRXBzb25Tb2Z0d2FyZVVwZGF0ZXIoKTsKIAogfSAvLyBNYWNB cHBsaWNhdGlvbgogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9SdW50aW1l QXBwbGljYXRpb25DaGVja3NDb2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jb2NvYS9SdW50aW1lQXBwbGljYXRpb25DaGVja3NDb2NvYS5tbQkocmV2aXNpb24g MjUxOTgwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUnVudGltZUFwcGxpY2F0 aW9uQ2hlY2tzQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE5Myw2ICsxOTMsMTIgQEAgYm9v bCBNYWNBcHBsaWNhdGlvbjo6aXNTb2xpZFN0YXRlTmV0d29yawogICAgIHJldHVybiBpc1NvbGlk U3RhdGVOZXR3b3Jrc0Rvd25sb2FkZXI7CiB9CiAKK2Jvb2wgTWFjQXBwbGljYXRpb246OmlzRXBz b25Tb2Z0d2FyZVVwZGF0ZXIoKQoreworICAgIHN0YXRpYyBib29sIGlzRXBzb25Tb2Z0d2FyZVVw ZGF0ZXIgPSBhcHBsaWNhdGlvbkJ1bmRsZUlzRXF1YWxUbygiY29tLmVwc29uLkVQU09OX1NvZnR3 YXJlX1VwZGF0ZXIiX3MpOworICAgIHJldHVybiBpc0Vwc29uU29mdHdhcmVVcGRhdGVyOworfQor CiAjZW5kaWYgLy8gUExBVEZPUk0oTUFDKQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKSW5k ZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MTk4NykKKysrIFNvdXJj ZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2 IEBACisyMDE5LTExLTA0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjQzOTQ3KSBFcHNvbiBzb2Z0d2FyZSB1cGRhdGVy IGZhaWxzIHRvIGluc3RhbGwgbmV3IHZlcnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzgwOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYw MDIxNzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBNaXNjL1dlYkRvd25sb2FkLm1tOgorICAgICAgICAoc2hvdWxkQ2FsbE9uTmV0d29ya1RocmVh ZCk6CisgICAgICAgIChjYWxsT25EZWxlZ2F0ZVRocmVhZCk6CisgICAgICAgIChpc0RlbGVnYXRl VGhyZWFkKToKKyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3dubG9hZERpZEJlZ2lu Ol0pOgorICAgICAgICAoLVtXZWJEb3dubG9hZEludGVybmFsIGRvd25sb2FkOndpbGxTZW5kUmVx dWVzdDpyZWRpcmVjdFJlc3BvbnNlOl0pOgorICAgICAgICAoLVtXZWJEb3dubG9hZEludGVybmFs IGRvd25sb2FkOmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpdKToKKyAgICAgICAg KC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3dubG9hZDpkaWRSZWNlaXZlUmVzcG9uc2U6XSk6Cisg ICAgICAgICgtW1dlYkRvd25sb2FkSW50ZXJuYWwgZG93bmxvYWQ6ZGlkUmVjZWl2ZURhdGFPZkxl bmd0aDpdKToKKyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3dubG9hZDpzaG91bGRE ZWNvZGVTb3VyY2VEYXRhT2ZNSU1FVHlwZTpdKToKKyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRl cm5hbCBkb3dubG9hZDpkZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFtZTpdKToK KyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3dubG9hZDpkaWRDcmVhdGVEZXN0aW5h dGlvbjpdKToKKyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3dubG9hZERpZEZpbmlz aDpdKToKKyAgICAgICAgKC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3dubG9hZDpkaWRGYWlsV2l0 aEVycm9yOl0pOgorCiAyMDE5LTExLTAyICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBBZGQgZGlhZ25vc3RpYyBsb2dnaW5nIGZvciBm cm9udGVuZCBmZWF0dXJlIHVzYWdlCkluZGV4OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9NaXNj L1dlYkRvd25sb2FkLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL01p c2MvV2ViRG93bmxvYWQubW0JKHJldmlzaW9uIDI1MTk4MCkKKysrIFNvdXJjZS9XZWJLaXRMZWdh Y3kvbWFjL01pc2MvV2ViRG93bmxvYWQubW0JKHdvcmtpbmcgY29weSkKQEAgLTM2LDEwICszNiwz NCBAQAogI2ltcG9ydCA8V2ViQ29yZS9DcmVkZW50aWFsU3RvcmFnZS5oPgogI2ltcG9ydCA8V2Vi Q29yZS9OZXR3b3JrU3RvcmFnZVNlc3Npb24uaD4KICNpbXBvcnQgPFdlYkNvcmUvUHJvdGVjdGlv blNwYWNlLmg+CisjaW1wb3J0IDxXZWJDb3JlL1J1bnRpbWVBcHBsaWNhdGlvbkNoZWNrcy5oPgog I2ltcG9ydCA8V2ViS2l0TGVnYWN5L1dlYlBhbmVsQXV0aGVudGljYXRpb25IYW5kbGVyLmg+CiAj aW1wb3J0IDxwYWwvc3BpL2NvY29hL05TVVJMRG93bmxvYWRTUEkuaD4KICNpbXBvcnQgPHd0Zi9B c3NlcnRpb25zLmg+CiAjaW1wb3J0IDx3dGYvTWFpblRocmVhZC5oPgorI2ltcG9ydCA8d3RmL3Nw aS9kYXJ3aW4vZHlsZFNQSS5oPgorCitzdGF0aWMgYm9vbCBzaG91bGRDYWxsT25OZXR3b3JrVGhy ZWFkKCkKK3sKKyNpZiBQTEFURk9STShNQUMpCisgICAgc3RhdGljIGJvb2wgaXNPbGRFcHNvblNv ZnR3YXJlVXBkYXRlciA9IFdlYkNvcmU6Ok1hY0FwcGxpY2F0aW9uOjppc0Vwc29uU29mdHdhcmVV cGRhdGVyKCkgJiYgZHlsZF9nZXRfcHJvZ3JhbV9zZGtfdmVyc2lvbigpIDwgRFlMRF9NQUNPU1hf VkVSU0lPTl8xMF8xNTsKKyAgICByZXR1cm4gaXNPbGRFcHNvblNvZnR3YXJlVXBkYXRlcjsKKyNl bHNlCisgICAgcmV0dXJuIGZhbHNlOworI2VuZGlmCit9CisKK3N0YXRpYyB2b2lkIGNhbGxPbkRl bGVnYXRlVGhyZWFkKEZ1bmN0aW9uPHZvaWQoKT4mJiBmdW5jdGlvbikKK3sKKyAgICBpZiAoc2hv dWxkQ2FsbE9uTmV0d29ya1RocmVhZCgpKQorICAgICAgICBmdW5jdGlvbigpOworICAgIGNhbGxP bk1haW5UaHJlYWQoV1RGTW92ZShmdW5jdGlvbikpOworfQorCitzdGF0aWMgYm9vbCBpc0RlbGVn YXRlVGhyZWFkKCkKK3sKKyAgICByZXR1cm4gc2hvdWxkQ2FsbE9uTmV0d29ya1RocmVhZCgpIHx8 IGlzTWFpblRocmVhZCgpOworfQogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtODMs NyArMTA3LDcgQEAgLSAoQk9PTClyZXNwb25kc1RvU2VsZWN0b3I6KFNFTClzZWxlY3RvcgogCiAt ICh2b2lkKWRvd25sb2FkRGlkQmVnaW46KE5TVVJMRG93bmxvYWQgKilkb3dubG9hZAogewotICAg IGNhbGxPbk1haW5UaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUp LCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCldIHsKKyAgICBjYWxsT25EZWxlZ2F0ZVRo cmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0g cmV0YWluUHRyKGRvd25sb2FkKV0gewogICAgICAgICBbcmVhbERlbGVnYXRlIGRvd25sb2FkRGlk QmVnaW46ZG93bmxvYWQuZ2V0KCldOwogICAgIH0pOwogfQpAQCAtOTUsNyArMTE5LDcgQEAgLSAo TlNVUkxSZXF1ZXN0ICopZG93bmxvYWQ6KE5TVVJMRG93bmxvYQogICAgICAgICBBU1NFUlQoaXNN YWluVGhyZWFkKCkpOwogICAgICAgICByZXR1cm5WYWx1ZSA9IFtyZWFsRGVsZWdhdGUgZG93bmxv YWQ6ZG93bmxvYWQgd2lsbFNlbmRSZXF1ZXN0OnJlcXVlc3QgcmVkaXJlY3RSZXNwb25zZTpyZWRp cmVjdFJlc3BvbnNlXTsKICAgICB9OwotICAgIGlmIChpc01haW5UaHJlYWQoKSkKKyAgICBpZiAo aXNEZWxlZ2F0ZVRocmVhZCgpKQogICAgICAgICB3b3JrKCk7CiAgICAgZWxzZQogICAgICAgICBk aXNwYXRjaF9zeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIHdvcmspOwpAQCAtMTE1LDEx ICsxMzksMTEgQEAgLSAodm9pZClkb3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRvd25sbwogICAg IH0KIAogICAgIGlmIChbcmVhbERlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io ZG93bmxvYWQ6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOildKSB7Ci0gICAgICAg IGNhbGxPbk1haW5UaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUp LCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCksIGNoYWxsZW5nZSA9IHJldGFpblB0cihj aGFsbGVuZ2UpXSB7CisgICAgICAgIGNhbGxPbkRlbGVnYXRlVGhyZWFkKFtyZWFsRGVsZWdhdGUg PSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQp LCBjaGFsbGVuZ2UgPSByZXRhaW5QdHIoY2hhbGxlbmdlKV0gewogICAgICAgICAgICAgW3JlYWxE ZWxlZ2F0ZSBkb3dubG9hZDpkb3dubG9hZC5nZXQoKSBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25D aGFsbGVuZ2U6Y2hhbGxlbmdlLmdldCgpXTsKICAgICAgICAgfSk7CiAgICAgfSBlbHNlIHsKLSAg ICAgICAgY2FsbE9uTWFpblRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxl Z2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKSwgY2hhbGxlbmdlID0gcmV0YWlu UHRyKGNoYWxsZW5nZSldIHsKKyAgICAgICAgY2FsbE9uRGVsZWdhdGVUaHJlYWQoW3JlYWxEZWxl Z2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3du bG9hZCksIGNoYWxsZW5nZSA9IHJldGFpblB0cihjaGFsbGVuZ2UpXSB7CiAgICAgICAgICAgICBO U1dpbmRvdyAqd2luZG93ID0gbmlsOwogICAgICAgICAgICAgaWYgKFtyZWFsRGVsZWdhdGUgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihkb3dubG9hZFdpbmRvd0ZvckF1dGhlbnRpY2F0aW9u U2hlZXQ6KV0pCiAgICAgICAgICAgICAgICAgd2luZG93ID0gW3JlYWxEZWxlZ2F0ZSBkb3dubG9h ZFdpbmRvd0ZvckF1dGhlbnRpY2F0aW9uU2hlZXQ6KFdlYkRvd25sb2FkICopZG93bmxvYWQuZ2V0 KCldOwpAQCAtMTMyLDE0ICsxNTYsMTQgQEAgLSAodm9pZClkb3dubG9hZDooTlNVUkxEb3dubG9h ZCAqKWRvd25sbwogCiAtICh2b2lkKWRvd25sb2FkOihOU1VSTERvd25sb2FkICopZG93bmxvYWQg ZGlkUmVjZWl2ZVJlc3BvbnNlOihOU1VSTFJlc3BvbnNlICopcmVzcG9uc2UKIHsKLSAgICBjYWxs T25NYWluVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93 bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQpLCByZXNwb25zZSA9IHJldGFpblB0cihyZXNwb25z ZSldIHsKKyAgICBjYWxsT25EZWxlZ2F0ZVRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRy KHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKSwgcmVzcG9uc2Ug PSByZXRhaW5QdHIocmVzcG9uc2UpXSB7CiAgICAgICAgIFtyZWFsRGVsZWdhdGUgZG93bmxvYWQ6 ZG93bmxvYWQuZ2V0KCkgZGlkUmVjZWl2ZVJlc3BvbnNlOnJlc3BvbnNlLmdldCgpXTsKICAgICB9 KTsKIH0KIAogLSAodm9pZClkb3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRvd25sb2FkIGRpZFJl Y2VpdmVEYXRhT2ZMZW5ndGg6KE5TVUludGVnZXIpbGVuZ3RoCiB7Ci0gICAgY2FsbE9uTWFpblRo cmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0g cmV0YWluUHRyKGRvd25sb2FkKSwgbGVuZ3RoXSB7CisgICAgY2FsbE9uRGVsZWdhdGVUaHJlYWQo W3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFp blB0cihkb3dubG9hZCksIGxlbmd0aF0gewogICAgICAgICBbcmVhbERlbGVnYXRlIGRvd25sb2Fk OmRvd25sb2FkLmdldCgpIGRpZFJlY2VpdmVEYXRhT2ZMZW5ndGg6bGVuZ3RoXTsKICAgICB9KTsK IH0KQEAgLTE1MCw3ICsxNzQsNyBAQCAtIChCT09MKWRvd25sb2FkOihOU1VSTERvd25sb2FkICop ZG93bmxvCiAgICAgYXV0byB3b3JrID0gWyZdIHsKICAgICAgICAgcmV0dXJuVmFsdWUgPSBbcmVh bERlbGVnYXRlIGRvd25sb2FkOmRvd25sb2FkIHNob3VsZERlY29kZVNvdXJjZURhdGFPZk1JTUVU eXBlOmVuY29kaW5nVHlwZV07CiAgICAgfTsKLSAgICBpZiAoaXNNYWluVGhyZWFkKCkpCisgICAg aWYgKGlzRGVsZWdhdGVUaHJlYWQoKSkKICAgICAgICAgd29yaygpOwogICAgIGVsc2UKICAgICAg ICAgZGlzcGF0Y2hfc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCB3b3JrKTsKQEAgLTE1 OSwyOCArMTgzLDI4IEBAIC0gKEJPT0wpZG93bmxvYWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG8K IAogLSAodm9pZClkb3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRvd25sb2FkIGRlY2lkZURlc3Rp bmF0aW9uV2l0aFN1Z2dlc3RlZEZpbGVuYW1lOihOU1N0cmluZyAqKWZpbGVuYW1lCiB7Ci0gICAg Y2FsbE9uTWFpblRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0ZSks IGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKSwgZmlsZW5hbWUgPSByZXRhaW5QdHIoZmls ZW5hbWUpXSB7CisgICAgY2FsbE9uRGVsZWdhdGVUaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFp blB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCksIGZpbGVu YW1lID0gcmV0YWluUHRyKGZpbGVuYW1lKV0gewogICAgICAgICBbcmVhbERlbGVnYXRlIGRvd25s b2FkOmRvd25sb2FkLmdldCgpIGRlY2lkZURlc3RpbmF0aW9uV2l0aFN1Z2dlc3RlZEZpbGVuYW1l OmZpbGVuYW1lLmdldCgpXTsKICAgICB9KTsKIH0KIAogLSAodm9pZClkb3dubG9hZDooTlNVUkxE b3dubG9hZCAqKWRvd25sb2FkIGRpZENyZWF0ZURlc3RpbmF0aW9uOihOU1N0cmluZyAqKXBhdGgK IHsKLSAgICBjYWxsT25NYWluVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERl bGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQpLCBwYXRoID0gcmV0YWluUHRy KHBhdGgpXSB7CisgICAgY2FsbE9uRGVsZWdhdGVUaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFp blB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCksIHBhdGgg PSByZXRhaW5QdHIocGF0aCldIHsKICAgICAgICAgW3JlYWxEZWxlZ2F0ZSBkb3dubG9hZDpkb3du bG9hZC5nZXQoKSBkaWRDcmVhdGVEZXN0aW5hdGlvbjpwYXRoLmdldCgpXTsKICAgICB9KTsKIH0K IAogLSAodm9pZClkb3dubG9hZERpZEZpbmlzaDooTlNVUkxEb3dubG9hZCAqKWRvd25sb2FkCiB7 Ci0gICAgY2FsbE9uTWFpblRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxl Z2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKV0geworICAgIGNhbGxPbkRlbGVn YXRlVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxv YWQgPSByZXRhaW5QdHIoZG93bmxvYWQpXSB7CiAgICAgICAgIFtyZWFsRGVsZWdhdGUgZG93bmxv YWREaWRGaW5pc2g6ZG93bmxvYWQuZ2V0KCldOwogICAgIH0pOwogfQogCiAtICh2b2lkKWRvd25s b2FkOihOU1VSTERvd25sb2FkICopZG93bmxvYWQgZGlkRmFpbFdpdGhFcnJvcjooTlNFcnJvciAq KWVycm9yCiB7Ci0gICAgY2FsbE9uTWFpblRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRy KHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKSwgZXJyb3IgPSBy ZXRhaW5QdHIoZXJyb3IpXSB7CisgICAgY2FsbE9uRGVsZWdhdGVUaHJlYWQoW3JlYWxEZWxlZ2F0 ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9h ZCksIGVycm9yID0gcmV0YWluUHRyKGVycm9yKV0gewogICAgICAgICBbcmVhbERlbGVnYXRlIGRv d25sb2FkOmRvd25sb2FkLmdldCgpIGRpZEZhaWxXaXRoRXJyb3I6ZXJyb3IuZ2V0KCldOwogICAg IH0pOwogfQo= 382746 2019-11-04 09:33:50 -0800 2019-11-04 10:21:03 -0800 Patch bug-203809-20191104173348.patch text/plain 9711 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI1MTk4NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE5LTExLTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lP TihyMjQzOTQ3KSBFcHNvbiBzb2Z0d2FyZSB1cGRhdGVyIGZhaWxzIHRvIGluc3RhbGwgbmV3IHZl cnNpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw MzgwOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTYwMDIxNzk+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgQnJhZHkgRWlkc29uLgorCisgICAgICAgIEkgbWFudWFsbHkgdmVyaWZpZWQgdGhpcyBm aXhlcyB0aGUgaXNzdWUuICBTZWUgdGhlIHJhZGFyLgorCisgICAgICAgICogcGxhdGZvcm0vUnVu dGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg6CisgICAgICAgICogcGxhdGZvcm0vY29jb2EvUnVudGlt ZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpNYWNBcHBsaWNh dGlvbjo6aXNFcHNvblNvZnR3YXJlVXBkYXRlcik6CisKIDIwMTktMTEtMDQgIHlvdWVubiBmYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIE9yZGVyIG9mIHBvc3RNZXNzYWdlIGFu ZCBmZXRjaCBldmVudHMgc2hvdWxkIGJlIHByZXNlcnZlZCB3aGVuIGdvaW5nIGZyb20gY2xpZW50 IHRvIHNlcnZpY2Ugd29ya2VyCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9SdW50aW1l QXBwbGljYXRpb25DaGVja3MuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9SdW50aW1lQXBwbGljYXRpb25DaGVja3MuaAkocmV2aXNpb24gMjUxOTgwKQorKysgU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmgJKHdvcmtpbmcgY29w eSkKQEAgLTY4LDYgKzY4LDcgQEAgYm9vbCBpc1NvbGlkU3RhdGVOZXR3b3Jrc0Rvd25sb2FkZXIo KTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNWZXJzaW9ucygpOwogV0VCQ09SRV9FWFBPUlQgYm9v bCBpc0hSQmxvY2soKTsKIFdFQkNPUkVfRVhQT1JUIGJvb2wgaXNJQWRQcm9kdWNlcigpOworV0VC Q09SRV9FWFBPUlQgYm9vbCBpc0Vwc29uU29mdHdhcmVVcGRhdGVyKCk7CiAKIH0gLy8gTWFjQXBw bGljYXRpb24KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY29jb2EvUnVudGltZUFw cGxpY2F0aW9uQ2hlY2tzQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vY29jb2EvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzQ29jb2EubW0JKHJldmlzaW9uIDI1 MTk4MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1J1bnRpbWVBcHBsaWNhdGlv bkNoZWNrc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTMsNiArMTkzLDEyIEBAIGJvb2wg TWFjQXBwbGljYXRpb246OmlzU29saWRTdGF0ZU5ldHdvcmsKICAgICByZXR1cm4gaXNTb2xpZFN0 YXRlTmV0d29ya3NEb3dubG9hZGVyOwogfQogCitib29sIE1hY0FwcGxpY2F0aW9uOjppc0Vwc29u U29mdHdhcmVVcGRhdGVyKCkKK3sKKyAgICBzdGF0aWMgYm9vbCBpc0Vwc29uU29mdHdhcmVVcGRh dGVyID0gYXBwbGljYXRpb25CdW5kbGVJc0VxdWFsVG8oImNvbS5lcHNvbi5FUFNPTl9Tb2Z0d2Fy ZV9VcGRhdGVyIl9zKTsKKyAgICByZXR1cm4gaXNFcHNvblNvZnR3YXJlVXBkYXRlcjsKK30KKwog I2VuZGlmIC8vIFBMQVRGT1JNKE1BQykKIAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCkluZGV4 OiBTb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdExlZ2FjeS9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTE5ODcpCisrKyBTb3VyY2Uv V2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNiBA QAorMjAxOS0xMS0wNCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3Jn PgorCisgICAgICAgIFJFR1JFU1NJT04ocjI0Mzk0NykgRXBzb24gc29mdHdhcmUgdXBkYXRlciBm YWlscyB0byBpbnN0YWxsIG5ldyB2ZXJzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM4MDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU2MDAy MTc5PgorCisgICAgICAgIFJldmlld2VkIGJ5IEJyYWR5IEVpZHNvbi4KKworICAgICAgICAqIE1p c2MvV2ViRG93bmxvYWQubW06CisgICAgICAgIChzaG91bGRDYWxsT25OZXR3b3JrVGhyZWFkKToK KyAgICAgICAgKGNhbGxPbkRlbGVnYXRlVGhyZWFkKToKKyAgICAgICAgKGlzRGVsZWdhdGVUaHJl YWQpOgorICAgICAgICAoLVtXZWJEb3dubG9hZEludGVybmFsIGRvd25sb2FkRGlkQmVnaW46XSk6 CisgICAgICAgICgtW1dlYkRvd25sb2FkSW50ZXJuYWwgZG93bmxvYWQ6d2lsbFNlbmRSZXF1ZXN0 OnJlZGlyZWN0UmVzcG9uc2U6XSk6CisgICAgICAgICgtW1dlYkRvd25sb2FkSW50ZXJuYWwgZG93 bmxvYWQ6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOl0pOgorICAgICAgICAoLVtX ZWJEb3dubG9hZEludGVybmFsIGRvd25sb2FkOmRpZFJlY2VpdmVSZXNwb25zZTpdKToKKyAgICAg ICAgKC1bV2ViRG93bmxvYWRJbnRlcm5hbCBkb3dubG9hZDpkaWRSZWNlaXZlRGF0YU9mTGVuZ3Ro Ol0pOgorICAgICAgICAoLVtXZWJEb3dubG9hZEludGVybmFsIGRvd25sb2FkOnNob3VsZERlY29k ZVNvdXJjZURhdGFPZk1JTUVUeXBlOl0pOgorICAgICAgICAoLVtXZWJEb3dubG9hZEludGVybmFs IGRvd25sb2FkOmRlY2lkZURlc3RpbmF0aW9uV2l0aFN1Z2dlc3RlZEZpbGVuYW1lOl0pOgorICAg ICAgICAoLVtXZWJEb3dubG9hZEludGVybmFsIGRvd25sb2FkOmRpZENyZWF0ZURlc3RpbmF0aW9u Ol0pOgorICAgICAgICAoLVtXZWJEb3dubG9hZEludGVybmFsIGRvd25sb2FkRGlkRmluaXNoOl0p OgorICAgICAgICAoLVtXZWJEb3dubG9hZEludGVybmFsIGRvd25sb2FkOmRpZEZhaWxXaXRoRXJy b3I6XSk6CisKIDIwMTktMTEtMDIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEFkZCBkaWFnbm9zdGljIGxvZ2dpbmcgZm9yIGZyb250 ZW5kIGZlYXR1cmUgdXNhZ2UKSW5kZXg6IFNvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL01pc2MvV2Vi RG93bmxvYWQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdExlZ2FjeS9tYWMvTWlzYy9X ZWJEb3dubG9hZC5tbQkocmV2aXNpb24gMjUxOTgwKQorKysgU291cmNlL1dlYktpdExlZ2FjeS9t YWMvTWlzYy9XZWJEb3dubG9hZC5tbQkod29ya2luZyBjb3B5KQpAQCAtMzYsMTAgKzM2LDM4IEBA CiAjaW1wb3J0IDxXZWJDb3JlL0NyZWRlbnRpYWxTdG9yYWdlLmg+CiAjaW1wb3J0IDxXZWJDb3Jl L05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oPgogI2ltcG9ydCA8V2ViQ29yZS9Qcm90ZWN0aW9uU3Bh Y2UuaD4KKyNpbXBvcnQgPFdlYkNvcmUvUnVudGltZUFwcGxpY2F0aW9uQ2hlY2tzLmg+CiAjaW1w b3J0IDxXZWJLaXRMZWdhY3kvV2ViUGFuZWxBdXRoZW50aWNhdGlvbkhhbmRsZXIuaD4KICNpbXBv cnQgPHBhbC9zcGkvY29jb2EvTlNVUkxEb3dubG9hZFNQSS5oPgogI2ltcG9ydCA8d3RmL0Fzc2Vy dGlvbnMuaD4KICNpbXBvcnQgPHd0Zi9NYWluVGhyZWFkLmg+CisjaW1wb3J0IDx3dGYvc3BpL2Rh cndpbi9keWxkU1BJLmg+CisKK3N0YXRpYyBib29sIHNob3VsZENhbGxPbk5ldHdvcmtUaHJlYWQo KQoreworI2lmIFBMQVRGT1JNKE1BQykKKyAgICBzdGF0aWMgYm9vbCBpc09sZEVwc29uU29mdHdh cmVVcGRhdGVyID0gV2ViQ29yZTo6TWFjQXBwbGljYXRpb246OmlzRXBzb25Tb2Z0d2FyZVVwZGF0 ZXIoKSAmJiBkeWxkX2dldF9wcm9ncmFtX3Nka192ZXJzaW9uKCkgPCBEWUxEX01BQ09TWF9WRVJT SU9OXzEwXzE1OworICAgIHJldHVybiBpc09sZEVwc29uU29mdHdhcmVVcGRhdGVyOworI2Vsc2UK KyAgICByZXR1cm4gZmFsc2U7CisjZW5kaWYKK30KKworc3RhdGljIHZvaWQgY2FsbE9uRGVsZWdh dGVUaHJlYWQoRnVuY3Rpb248dm9pZCgpPiYmIGZ1bmN0aW9uKQoreworICAgIGlmIChzaG91bGRD YWxsT25OZXR3b3JrVGhyZWFkKCkpCisgICAgICAgIGZ1bmN0aW9uKCk7CisgICAgY2FsbE9uTWFp blRocmVhZChXVEZNb3ZlKGZ1bmN0aW9uKSk7Cit9CisKK3RlbXBsYXRlPHR5cGVuYW1lIENhbGxh YmxlPgorc3RhdGljIHZvaWQgY2FsbE9uRGVsZWdhdGVUaHJlYWRBbmRXYWl0KENhbGxhYmxlJiYg d29yaykKK3sKKyAgICBpZiAoc2hvdWxkQ2FsbE9uTmV0d29ya1RocmVhZCgpIHx8IGlzTWFpblRo cmVhZCgpKQorICAgICAgICB3b3JrKCk7CisgICAgZWxzZQorICAgICAgICBkaXNwYXRjaF9zeW5j KGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIHdvcmspOworfQogCiB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKIApAQCAtODMsNyArMTExLDcgQEAgLSAoQk9PTClyZXNwb25kc1RvU2VsZWN0b3I6 KFNFTClzZWxlY3RvcgogCiAtICh2b2lkKWRvd25sb2FkRGlkQmVnaW46KE5TVVJMRG93bmxvYWQg Kilkb3dubG9hZAogewotICAgIGNhbGxPbk1haW5UaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFp blB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCldIHsKKyAg ICBjYWxsT25EZWxlZ2F0ZVRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxl Z2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKV0gewogICAgICAgICBbcmVhbERl bGVnYXRlIGRvd25sb2FkRGlkQmVnaW46ZG93bmxvYWQuZ2V0KCldOwogICAgIH0pOwogfQpAQCAt OTUsMTAgKzEyMyw3IEBAIC0gKE5TVVJMUmVxdWVzdCAqKWRvd25sb2FkOihOU1VSTERvd25sb2EK ICAgICAgICAgQVNTRVJUKGlzTWFpblRocmVhZCgpKTsKICAgICAgICAgcmV0dXJuVmFsdWUgPSBb cmVhbERlbGVnYXRlIGRvd25sb2FkOmRvd25sb2FkIHdpbGxTZW5kUmVxdWVzdDpyZXF1ZXN0IHJl ZGlyZWN0UmVzcG9uc2U6cmVkaXJlY3RSZXNwb25zZV07CiAgICAgfTsKLSAgICBpZiAoaXNNYWlu VGhyZWFkKCkpCi0gICAgICAgIHdvcmsoKTsKLSAgICBlbHNlCi0gICAgICAgIGRpc3BhdGNoX3N5 bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgd29yayk7CisgICAgY2FsbE9uRGVsZWdhdGVU aHJlYWRBbmRXYWl0KFdURk1vdmUod29yaykpOwogICAgIHJldHVybiByZXR1cm5WYWx1ZS5hdXRv cmVsZWFzZSgpOwogfQogCkBAIC0xMTUsMTEgKzE0MCwxMSBAQCAtICh2b2lkKWRvd25sb2FkOihO U1VSTERvd25sb2FkICopZG93bmxvCiAgICAgfQogCiAgICAgaWYgKFtyZWFsRGVsZWdhdGUgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihkb3dubG9hZDpkaWRSZWNlaXZlQXV0aGVudGljYXRp b25DaGFsbGVuZ2U6KV0pIHsKLSAgICAgICAgY2FsbE9uTWFpblRocmVhZChbcmVhbERlbGVnYXRl ID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2Fk KSwgY2hhbGxlbmdlID0gcmV0YWluUHRyKGNoYWxsZW5nZSldIHsKKyAgICAgICAgY2FsbE9uRGVs ZWdhdGVUaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3du bG9hZCA9IHJldGFpblB0cihkb3dubG9hZCksIGNoYWxsZW5nZSA9IHJldGFpblB0cihjaGFsbGVu Z2UpXSB7CiAgICAgICAgICAgICBbcmVhbERlbGVnYXRlIGRvd25sb2FkOmRvd25sb2FkLmdldCgp IGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpjaGFsbGVuZ2UuZ2V0KCldOwogICAg ICAgICB9KTsKICAgICB9IGVsc2UgewotICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtyZWFsRGVs ZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93 bmxvYWQpLCBjaGFsbGVuZ2UgPSByZXRhaW5QdHIoY2hhbGxlbmdlKV0geworICAgICAgICBjYWxs T25EZWxlZ2F0ZVRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxlZ2F0ZSks IGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKSwgY2hhbGxlbmdlID0gcmV0YWluUHRyKGNo YWxsZW5nZSldIHsKICAgICAgICAgICAgIE5TV2luZG93ICp3aW5kb3cgPSBuaWw7CiAgICAgICAg ICAgICBpZiAoW3JlYWxEZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKGRvd25s b2FkV2luZG93Rm9yQXV0aGVudGljYXRpb25TaGVldDopXSkKICAgICAgICAgICAgICAgICB3aW5k b3cgPSBbcmVhbERlbGVnYXRlIGRvd25sb2FkV2luZG93Rm9yQXV0aGVudGljYXRpb25TaGVldDoo V2ViRG93bmxvYWQgKilkb3dubG9hZC5nZXQoKV07CkBAIC0xMzIsMTQgKzE1NywxNCBAQCAtICh2 b2lkKWRvd25sb2FkOihOU1VSTERvd25sb2FkICopZG93bmxvCiAKIC0gKHZvaWQpZG93bmxvYWQ6 KE5TVVJMRG93bmxvYWQgKilkb3dubG9hZCBkaWRSZWNlaXZlUmVzcG9uc2U6KE5TVVJMUmVzcG9u c2UgKilyZXNwb25zZQogewotICAgIGNhbGxPbk1haW5UaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJl dGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCksIHJl c3BvbnNlID0gcmV0YWluUHRyKHJlc3BvbnNlKV0geworICAgIGNhbGxPbkRlbGVnYXRlVGhyZWFk KFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRh aW5QdHIoZG93bmxvYWQpLCByZXNwb25zZSA9IHJldGFpblB0cihyZXNwb25zZSldIHsKICAgICAg ICAgW3JlYWxEZWxlZ2F0ZSBkb3dubG9hZDpkb3dubG9hZC5nZXQoKSBkaWRSZWNlaXZlUmVzcG9u c2U6cmVzcG9uc2UuZ2V0KCldOwogICAgIH0pOwogfQogCiAtICh2b2lkKWRvd25sb2FkOihOU1VS TERvd25sb2FkICopZG93bmxvYWQgZGlkUmVjZWl2ZURhdGFPZkxlbmd0aDooTlNVSW50ZWdlcils ZW5ndGgKIHsKLSAgICBjYWxsT25NYWluVGhyZWFkKFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIo cmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93bmxvYWQpLCBsZW5ndGhdIHsK KyAgICBjYWxsT25EZWxlZ2F0ZVRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxE ZWxlZ2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKSwgbGVuZ3RoXSB7CiAgICAg ICAgIFtyZWFsRGVsZWdhdGUgZG93bmxvYWQ6ZG93bmxvYWQuZ2V0KCkgZGlkUmVjZWl2ZURhdGFP Zkxlbmd0aDpsZW5ndGhdOwogICAgIH0pOwogfQpAQCAtMTUwLDM3ICsxNzUsMzQgQEAgLSAoQk9P TClkb3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRvd25sbwogICAgIGF1dG8gd29yayA9IFsmXSB7 CiAgICAgICAgIHJldHVyblZhbHVlID0gW3JlYWxEZWxlZ2F0ZSBkb3dubG9hZDpkb3dubG9hZCBz aG91bGREZWNvZGVTb3VyY2VEYXRhT2ZNSU1FVHlwZTplbmNvZGluZ1R5cGVdOwogICAgIH07Ci0g ICAgaWYgKGlzTWFpblRocmVhZCgpKQotICAgICAgICB3b3JrKCk7Ci0gICAgZWxzZQotICAgICAg ICBkaXNwYXRjaF9zeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIHdvcmspOworICAgIGNh bGxPbkRlbGVnYXRlVGhyZWFkQW5kV2FpdChXVEZNb3ZlKHdvcmspKTsKICAgICByZXR1cm4gcmV0 dXJuVmFsdWU7CiB9CiAKIC0gKHZvaWQpZG93bmxvYWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG9h ZCBkZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFtZTooTlNTdHJpbmcgKilmaWxl bmFtZQogewotICAgIGNhbGxPbk1haW5UaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFpblB0cihy ZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCksIGZpbGVuYW1lID0g cmV0YWluUHRyKGZpbGVuYW1lKV0geworICAgIGNhbGxPbkRlbGVnYXRlVGhyZWFkKFtyZWFsRGVs ZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93 bmxvYWQpLCBmaWxlbmFtZSA9IHJldGFpblB0cihmaWxlbmFtZSldIHsKICAgICAgICAgW3JlYWxE ZWxlZ2F0ZSBkb3dubG9hZDpkb3dubG9hZC5nZXQoKSBkZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdn ZXN0ZWRGaWxlbmFtZTpmaWxlbmFtZS5nZXQoKV07CiAgICAgfSk7CiB9CiAKIC0gKHZvaWQpZG93 bmxvYWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG9hZCBkaWRDcmVhdGVEZXN0aW5hdGlvbjooTlNT dHJpbmcgKilwYXRoCiB7Ci0gICAgY2FsbE9uTWFpblRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0 YWluUHRyKHJlYWxEZWxlZ2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKSwgcGF0 aCA9IHJldGFpblB0cihwYXRoKV0geworICAgIGNhbGxPbkRlbGVnYXRlVGhyZWFkKFtyZWFsRGVs ZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRhaW5QdHIoZG93 bmxvYWQpLCBwYXRoID0gcmV0YWluUHRyKHBhdGgpXSB7CiAgICAgICAgIFtyZWFsRGVsZWdhdGUg ZG93bmxvYWQ6ZG93bmxvYWQuZ2V0KCkgZGlkQ3JlYXRlRGVzdGluYXRpb246cGF0aC5nZXQoKV07 CiAgICAgfSk7CiB9CiAKIC0gKHZvaWQpZG93bmxvYWREaWRGaW5pc2g6KE5TVVJMRG93bmxvYWQg Kilkb3dubG9hZAogewotICAgIGNhbGxPbk1haW5UaHJlYWQoW3JlYWxEZWxlZ2F0ZSA9IHJldGFp blB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9hZCldIHsKKyAg ICBjYWxsT25EZWxlZ2F0ZVRocmVhZChbcmVhbERlbGVnYXRlID0gcmV0YWluUHRyKHJlYWxEZWxl Z2F0ZSksIGRvd25sb2FkID0gcmV0YWluUHRyKGRvd25sb2FkKV0gewogICAgICAgICBbcmVhbERl bGVnYXRlIGRvd25sb2FkRGlkRmluaXNoOmRvd25sb2FkLmdldCgpXTsKICAgICB9KTsKIH0KIAog LSAodm9pZClkb3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRvd25sb2FkIGRpZEZhaWxXaXRoRXJy b3I6KE5TRXJyb3IgKillcnJvcgogewotICAgIGNhbGxPbk1haW5UaHJlYWQoW3JlYWxEZWxlZ2F0 ZSA9IHJldGFpblB0cihyZWFsRGVsZWdhdGUpLCBkb3dubG9hZCA9IHJldGFpblB0cihkb3dubG9h ZCksIGVycm9yID0gcmV0YWluUHRyKGVycm9yKV0geworICAgIGNhbGxPbkRlbGVnYXRlVGhyZWFk KFtyZWFsRGVsZWdhdGUgPSByZXRhaW5QdHIocmVhbERlbGVnYXRlKSwgZG93bmxvYWQgPSByZXRh aW5QdHIoZG93bmxvYWQpLCBlcnJvciA9IHJldGFpblB0cihlcnJvcildIHsKICAgICAgICAgW3Jl YWxEZWxlZ2F0ZSBkb3dubG9hZDpkb3dubG9hZC5nZXQoKSBkaWRGYWlsV2l0aEVycm9yOmVycm9y LmdldCgpXTsKICAgICB9KTsKIH0K