208846 2020-03-09 19:34:20 -0700 File upload cancels before files can be uploaded. 2020-03-10 12:16:29 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 megan_gardner megan_gardner bdakin commit-queue thorton wenson_hsieh oldest_to_newest 1628081 0 megan_gardner 2020-03-09 19:34:20 -0700 File upload cancels before files can be uploaded. 1628095 1 393117 megan_gardner 2020-03-09 20:15:23 -0700 Created attachment 393117 Patch 1628097 2 393117 thorton 2020-03-09 20:32:09 -0700 Comment on attachment 393117 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393117&action=review > Source/WebKit/ChangeLog:11 > + With the new UIContextMenus, we needed to cancel in order for everything to be > + reset correclty in WebCore. But this can only be done in the animation completetion > + handler, but we only want to cancel if we aren't presenting a different picker. Spelling: "correctly" Spelling: "completetion" We should figure out how to test this (though I have a feeling any way we test this would probably bypass exactly the parts that are a problem here). > Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm:442 > + self->_isPresentingSubMenu = YES; Should this be held weakly? Is it possible for WKFileUploadPanel to go away before the handler is called? > Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm:473 > + [self _cancel]; Who cancels after the submenu is dismissed? If it's really necessary, it seems like a problem that it doesn't happen. 1628333 3 393117 thorton 2020-03-10 11:16:24 -0700 Comment on attachment 393117 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=393117&action=review >> Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm:473 >> + [self _cancel]; > > Who cancels after the submenu is dismissed? If it's really necessary, it seems like a problem that it doesn't happen. Megan notes that the submenus themselves already call _cancel, so this should be OK 1628339 4 393168 megan_gardner 2020-03-10 11:30:15 -0700 Created attachment 393168 Patch for landing 1628341 5 megan_gardner 2020-03-10 11:31:16 -0700 <rdar://problem/60244249> 1628355 6 393168 commit-queue 2020-03-10 12:16:28 -0700 Comment on attachment 393168 Patch for landing Clearing flags on attachment: 393168 Committed r258225: <https://trac.webkit.org/changeset/258225> 1628356 7 commit-queue 2020-03-10 12:16:29 -0700 All reviewed patches have been landed. Closing bug. 393117 2020-03-09 20:15:23 -0700 2020-03-10 11:30:14 -0700 Patch bug-208846-20200309201522.patch text/plain 4213 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg4YWU0YjJjZjhjYjViMzgx YjcxM2I5YTUwOWQ3NjJkZDgwMTA2YmYuLjUxMjQyNDdlYTRiNjZiNzgxYjg1ZGVmZWFmOWU3MTYw MDlkMTk4MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDMtMDkgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBGaWxlIHVwbG9hZCBj YW5jZWxzIGJlZm9yZSBmaWxlcyBjYW4gYmUgdXBsb2FkZWQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg4NDYKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzYwMjQ0MjQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFdpdGggdGhlIG5ldyBVSUNvbnRleHRNZW51cywgd2UgbmVlZGVkIHRvIGNhbmNlbCBp biBvcmRlciBmb3IgZXZlcnl0aGluZyB0byBiZSAKKyAgICAgICAgcmVzZXQgY29ycmVjbHR5IGlu IFdlYkNvcmUuIEJ1dCB0aGlzIGNhbiBvbmx5IGJlIGRvbmUgaW4gdGhlIGFuaW1hdGlvbiBjb21w bGV0ZXRpb24KKyAgICAgICAgaGFuZGxlciwgYnV0IHdlIG9ubHkgd2FudCB0byBjYW5jZWwgaWYg d2UgYXJlbid0IHByZXNlbnRpbmcgYSBkaWZmZXJlbnQgcGlja2VyLgorCisgICAgICAgICogVUlQ cm9jZXNzL2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbToKKyAgICAgICAgKC1bV0tGaWxl VXBsb2FkUGFuZWwgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1cmF0aW9uRm9yTWVudUF0 TG9jYXRpb246XSk6CisgICAgICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIGNvbnRleHRNZW51SW50 ZXJhY3Rpb246d2lsbEVuZEZvckNvbmZpZ3VyYXRpb246YW5pbWF0b3I6XSk6CisgICAgICAgICgt W1dLRmlsZVVwbG9hZFBhbmVsIGVuc3VyZUNvbnRleHRNZW51SW50ZXJhY3Rpb25dKToKKwogMjAy MC0wMy0wOSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlbmFtZSB1 cmxTZWxlY3RlZCB0byBjaGFuZ2VMb2NhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCmluZGV4IGJiMjNhZGJlMjEz MWQ4MzA1NGVmM2Q4YmIxNzUxN2E4OTZhZDhiZGQuLmFmZjNiMDNlYzczODFlM2M5NGU1OThiYzMx ZmE1ODM1MjQ1NjEyZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9m b3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvZm9ybXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KQEAgLTE2OSw2ICsxNjksNyBAQCBzdGF0aWMg Ym9vbCBhcnJheUNvbnRhaW5zVVRJVGhhdENvbmZvcm1zVG8oTlNBcnJheTxOU1N0cmluZyAqPiAq dHlwZUlkZW50aWZpZXJzLAogICAgIFJldGFpblB0cjxVSVZpZXdDb250cm9sbGVyPiBfcHJlc2Vu dGF0aW9uVmlld0NvbnRyb2xsZXI7IC8vIGlQaG9uZSBhbHdheXMuIGlQYWQgZm9yIEZ1bGxzY3Jl ZW4gQ2FtZXJhLgogICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAg UmV0YWluUHRyPFVJUG9wb3ZlckNvbnRyb2xsZXI+IF9wcmVzZW50YXRpb25Qb3BvdmVyOyAvLyBp UGFkIGZvciBhY3Rpb24gc2hlZXQgYW5kIFBob3RvIExpYnJhcnkuCisgICAgQk9PTCBfaXNQcmVz ZW50aW5nU3ViTWVudTsKICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICNp ZiBVU0UoVUlDT05URVhUTUVOVSkKICAgICBSZXRhaW5QdHI8VUlDb250ZXh0TWVudUludGVyYWN0 aW9uPiBfZG9jdW1lbnRDb250ZXh0TWVudUludGVyYWN0aW9uOwpAQCAtNDM2LDExICs0MzcsMTQg QEAgc3RhdGljIE5TU2V0PE5TU3RyaW5nICo+ICpVVElzRm9yTUlNRVR5cGVzKE5TQXJyYXkgKm1p bWVUeXBlcykKICAgICAgICAgaWYgKCFzdHJvbmdTZWxmKQogICAgICAgICAgICAgcmV0dXJuIG5p bDsKICAgICAgICAgCisgICAgICAgIHNlbGYtPl9pc1ByZXNlbnRpbmdTdWJNZW51ID0gTk87CiAg ICAgICAgIFVJQWN0aW9uICpicm93c2VBY3Rpb24gPSBbVUlBY3Rpb24gYWN0aW9uV2l0aFRpdGxl OltzdHJvbmdTZWxmIF9icm93c2VGaWxlc0J1dHRvbkxhYmVsXSBpbWFnZTpbVUlJbWFnZSBzeXN0 ZW1JbWFnZU5hbWVkOkAiZWxsaXBzaXMiXSBpZGVudGlmaWVyOkAiYnJvd3NlIiBoYW5kbGVyOl4o X19raW5kb2YgVUlBY3Rpb24gKmFjdGlvbikgeworICAgICAgICAgICAgc2VsZi0+X2lzUHJlc2Vu dGluZ1N1Yk1lbnUgPSBZRVM7CiAgICAgICAgICAgICBbc2VsZiBzaG93RmlsZVBpY2tlck1lbnVd OwogICAgICAgICB9XTsKIAogICAgICAgICBVSUFjdGlvbiAqcGhvdG9BY3Rpb24gPSBbVUlBY3Rp b24gYWN0aW9uV2l0aFRpdGxlOltzdHJvbmdTZWxmIF9waG90b0xpYnJhcnlCdXR0b25MYWJlbF0g aW1hZ2U6W1VJSW1hZ2Ugc3lzdGVtSW1hZ2VOYW1lZDpAInJlY3RhbmdsZS5vbi5yZWN0YW5nbGUi XSBpZGVudGlmaWVyOkAicGhvdG8iIGhhbmRsZXI6XihfX2tpbmRvZiBVSUFjdGlvbiAqYWN0aW9u KSB7CisgICAgICAgICAgICBzZWxmLT5faXNQcmVzZW50aW5nU3ViTWVudSA9IFlFUzsKICAgICAg ICAgICAgIFtzZWxmIF9zaG93UGhvdG9QaWNrZXJXaXRoU291cmNlVHlwZTpVSUltYWdlUGlja2Vy Q29udHJvbGxlclNvdXJjZVR5cGVQaG90b0xpYnJhcnldOwogICAgICAgICB9XTsKIApAQCAtNDQ4 LDYgKzQ1Miw3IEBAIHN0YXRpYyBOU1NldDxOU1N0cmluZyAqPiAqVVRJc0Zvck1JTUVUeXBlcyhO U0FycmF5ICptaW1lVHlwZXMpCiAgICAgICAgICAgICBOU1N0cmluZyAqY2FtZXJhU3RyaW5nID0g W3N0cm9uZ1NlbGYgX2NhbWVyYUJ1dHRvbkxhYmVsQWxsb3dpbmdQaG90bzphbGxvd3NJbWFnZU1l ZGlhVHlwZSBhbGxvd2luZ1ZpZGVvOmFsbG93c1ZpZGVvTWVkaWFUeXBlXTsKICAgICAgICAgICAg IFVJQWN0aW9uICpjYW1lcmFBY3Rpb24gPSBbVUlBY3Rpb24gYWN0aW9uV2l0aFRpdGxlOmNhbWVy YVN0cmluZyBpbWFnZTpbVUlJbWFnZSBzeXN0ZW1JbWFnZU5hbWVkOkAiY2FtZXJhLmZpbGwiXSBp ZGVudGlmaWVyOkAiY2FtZXJhIiBoYW5kbGVyOl4oX19raW5kb2YgVUlBY3Rpb24gKmFjdGlvbikg ewogICAgICAgICAgICAgICAgIF91c2luZ0NhbWVyYSA9IFlFUzsKKyAgICAgICAgICAgICAgICBz ZWxmLT5faXNQcmVzZW50aW5nU3ViTWVudSA9IFlFUzsKICAgICAgICAgICAgICAgICBbc2VsZiBf c2hvd1Bob3RvUGlja2VyV2l0aFNvdXJjZVR5cGU6VUlJbWFnZVBpY2tlckNvbnRyb2xsZXJTb3Vy Y2VUeXBlQ2FtZXJhXTsKICAgICAgICAgICAgIH1dOwogICAgICAgICAgICAgYWN0aW9ucyA9IEBb cGhvdG9BY3Rpb24sIGNhbWVyYUFjdGlvbiwgYnJvd3NlQWN0aW9uXTsKQEAgLTQ2NCw3ICs0Njks OCBAQCBzdGF0aWMgTlNTZXQ8TlNTdHJpbmcgKj4gKlVUSXNGb3JNSU1FVHlwZXMoTlNBcnJheSAq bWltZVR5cGVzKQogewogICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOl57CiAgICAgICAgIFtz ZWxmIHJlbW92ZUNvbnRleHRNZW51SW50ZXJhY3Rpb25dOwotICAgICAgICBbc2VsZiBfY2FuY2Vs XTsKKyAgICAgICAgaWYgKCFzZWxmLT5faXNQcmVzZW50aW5nU3ViTWVudSkKKyAgICAgICAgICAg IFtzZWxmIF9jYW5jZWxdOwogICAgIH1dOwogfQogCkBAIC00ODEsNiArNDg3LDcgQEAgc3RhdGlj IE5TU2V0PE5TU3RyaW5nICo+ICpVVElzRm9yTUlNRVR5cGVzKE5TQXJyYXkgKm1pbWVUeXBlcykK ICAgICBpZiAoIV9kb2N1bWVudENvbnRleHRNZW51SW50ZXJhY3Rpb24pIHsKICAgICAgICAgX2Rv Y3VtZW50Q29udGV4dE1lbnVJbnRlcmFjdGlvbiA9IGFkb3B0TlMoW1tVSUNvbnRleHRNZW51SW50 ZXJhY3Rpb24gYWxsb2NdIGluaXRXaXRoRGVsZWdhdGU6c2VsZl0pOwogICAgICAgICBbX3ZpZXcg YWRkSW50ZXJhY3Rpb246X2RvY3VtZW50Q29udGV4dE1lbnVJbnRlcmFjdGlvbi5nZXQoKV07Cisg ICAgICAgIHNlbGYtPl9pc1ByZXNlbnRpbmdTdWJNZW51ID0gTk87CiAgICAgfQogfQogCg== 393168 2020-03-10 11:30:15 -0700 2020-03-10 12:16:28 -0700 Patch for landing bug-208846-20200310113015.patch text/plain 4207 megan_gardner U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4MTQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg4YWU0YjJjZjhjYjViMzgx YjcxM2I5YTUwOWQ3NjJkZDgwMTA2YmYuLjcwNjM3OWRjYzAzNzdmNjYzY2VmMzA5NGExMjQ2MDZj NTliN2M2NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDMtMDkgIE1lZ2FuIEdh cmRuZXIgIDxtZWdhbl9nYXJkbmVyQGFwcGxlLmNvbT4KKworICAgICAgICBGaWxlIHVwbG9hZCBj YW5jZWxzIGJlZm9yZSBmaWxlcyBjYW4gYmUgdXBsb2FkZWQuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg4NDYKKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzYwMjQ0MjQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAg ICAgV2l0aCB0aGUgbmV3IFVJQ29udGV4dE1lbnVzLCB3ZSBuZWVkZWQgdG8gY2FuY2VsIGluIG9y ZGVyIGZvciBldmVyeXRoaW5nIHRvIGJlIAorICAgICAgICByZXNldCBjb3JyZWN0bHkgaW4gV2Vi Q29yZS4gQnV0IHRoaXMgY2FuIG9ubHkgYmUgZG9uZSBpbiB0aGUgYW5pbWF0aW9uIGNvbXBsZXRp b24KKyAgICAgICAgaGFuZGxlciwgYnV0IHdlIG9ubHkgd2FudCB0byBjYW5jZWwgaWYgd2UgYXJl bid0IHByZXNlbnRpbmcgYSBkaWZmZXJlbnQgcGlja2VyLgorCisgICAgICAgICogVUlQcm9jZXNz L2lvcy9mb3Jtcy9XS0ZpbGVVcGxvYWRQYW5lbC5tbToKKyAgICAgICAgKC1bV0tGaWxlVXBsb2Fk UGFuZWwgY29udGV4dE1lbnVJbnRlcmFjdGlvbjpjb25maWd1cmF0aW9uRm9yTWVudUF0TG9jYXRp b246XSk6CisgICAgICAgICgtW1dLRmlsZVVwbG9hZFBhbmVsIGNvbnRleHRNZW51SW50ZXJhY3Rp b246d2lsbEVuZEZvckNvbmZpZ3VyYXRpb246YW5pbWF0b3I6XSk6CisgICAgICAgICgtW1dLRmls ZVVwbG9hZFBhbmVsIGVuc3VyZUNvbnRleHRNZW51SW50ZXJhY3Rpb25dKToKKwogMjAyMC0wMy0w OSAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFJlbmFtZSB1cmxTZWxl Y3RlZCB0byBjaGFuZ2VMb2NhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL2Zvcm1zL1dLRmlsZVVwbG9hZFBhbmVsLm1tCmluZGV4IGJiMjNhZGJlMjEzMWQ4MzA1 NGVmM2Q4YmIxNzUxN2E4OTZhZDhiZGQuLmFmZjNiMDNlYzczODFlM2M5NGU1OThiYzMxZmE1ODM1 MjQ1NjEyZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0ZpbGVVcGxvYWRQYW5lbC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9y bXMvV0tGaWxlVXBsb2FkUGFuZWwubW0KQEAgLTE2OSw2ICsxNjksNyBAQCBzdGF0aWMgYm9vbCBh cnJheUNvbnRhaW5zVVRJVGhhdENvbmZvcm1zVG8oTlNBcnJheTxOU1N0cmluZyAqPiAqdHlwZUlk ZW50aWZpZXJzLAogICAgIFJldGFpblB0cjxVSVZpZXdDb250cm9sbGVyPiBfcHJlc2VudGF0aW9u Vmlld0NvbnRyb2xsZXI7IC8vIGlQaG9uZSBhbHdheXMuIGlQYWQgZm9yIEZ1bGxzY3JlZW4gQ2Ft ZXJhLgogICAgIEFMTE9XX0RFUFJFQ0FURURfREVDTEFSQVRJT05TX0JFR0lOCiAgICAgUmV0YWlu UHRyPFVJUG9wb3ZlckNvbnRyb2xsZXI+IF9wcmVzZW50YXRpb25Qb3BvdmVyOyAvLyBpUGFkIGZv ciBhY3Rpb24gc2hlZXQgYW5kIFBob3RvIExpYnJhcnkuCisgICAgQk9PTCBfaXNQcmVzZW50aW5n U3ViTWVudTsKICAgICBBTExPV19ERVBSRUNBVEVEX0RFQ0xBUkFUSU9OU19FTkQKICNpZiBVU0Uo VUlDT05URVhUTUVOVSkKICAgICBSZXRhaW5QdHI8VUlDb250ZXh0TWVudUludGVyYWN0aW9uPiBf ZG9jdW1lbnRDb250ZXh0TWVudUludGVyYWN0aW9uOwpAQCAtNDM2LDExICs0MzcsMTQgQEAgc3Rh dGljIE5TU2V0PE5TU3RyaW5nICo+ICpVVElzRm9yTUlNRVR5cGVzKE5TQXJyYXkgKm1pbWVUeXBl cykKICAgICAgICAgaWYgKCFzdHJvbmdTZWxmKQogICAgICAgICAgICAgcmV0dXJuIG5pbDsKICAg ICAgICAgCisgICAgICAgIHNlbGYtPl9pc1ByZXNlbnRpbmdTdWJNZW51ID0gTk87CiAgICAgICAg IFVJQWN0aW9uICpicm93c2VBY3Rpb24gPSBbVUlBY3Rpb24gYWN0aW9uV2l0aFRpdGxlOltzdHJv bmdTZWxmIF9icm93c2VGaWxlc0J1dHRvbkxhYmVsXSBpbWFnZTpbVUlJbWFnZSBzeXN0ZW1JbWFn ZU5hbWVkOkAiZWxsaXBzaXMiXSBpZGVudGlmaWVyOkAiYnJvd3NlIiBoYW5kbGVyOl4oX19raW5k b2YgVUlBY3Rpb24gKmFjdGlvbikgeworICAgICAgICAgICAgc2VsZi0+X2lzUHJlc2VudGluZ1N1 Yk1lbnUgPSBZRVM7CiAgICAgICAgICAgICBbc2VsZiBzaG93RmlsZVBpY2tlck1lbnVdOwogICAg ICAgICB9XTsKIAogICAgICAgICBVSUFjdGlvbiAqcGhvdG9BY3Rpb24gPSBbVUlBY3Rpb24gYWN0 aW9uV2l0aFRpdGxlOltzdHJvbmdTZWxmIF9waG90b0xpYnJhcnlCdXR0b25MYWJlbF0gaW1hZ2U6 W1VJSW1hZ2Ugc3lzdGVtSW1hZ2VOYW1lZDpAInJlY3RhbmdsZS5vbi5yZWN0YW5nbGUiXSBpZGVu dGlmaWVyOkAicGhvdG8iIGhhbmRsZXI6XihfX2tpbmRvZiBVSUFjdGlvbiAqYWN0aW9uKSB7Cisg ICAgICAgICAgICBzZWxmLT5faXNQcmVzZW50aW5nU3ViTWVudSA9IFlFUzsKICAgICAgICAgICAg IFtzZWxmIF9zaG93UGhvdG9QaWNrZXJXaXRoU291cmNlVHlwZTpVSUltYWdlUGlja2VyQ29udHJv bGxlclNvdXJjZVR5cGVQaG90b0xpYnJhcnldOwogICAgICAgICB9XTsKIApAQCAtNDQ4LDYgKzQ1 Miw3IEBAIHN0YXRpYyBOU1NldDxOU1N0cmluZyAqPiAqVVRJc0Zvck1JTUVUeXBlcyhOU0FycmF5 ICptaW1lVHlwZXMpCiAgICAgICAgICAgICBOU1N0cmluZyAqY2FtZXJhU3RyaW5nID0gW3N0cm9u Z1NlbGYgX2NhbWVyYUJ1dHRvbkxhYmVsQWxsb3dpbmdQaG90bzphbGxvd3NJbWFnZU1lZGlhVHlw ZSBhbGxvd2luZ1ZpZGVvOmFsbG93c1ZpZGVvTWVkaWFUeXBlXTsKICAgICAgICAgICAgIFVJQWN0 aW9uICpjYW1lcmFBY3Rpb24gPSBbVUlBY3Rpb24gYWN0aW9uV2l0aFRpdGxlOmNhbWVyYVN0cmlu ZyBpbWFnZTpbVUlJbWFnZSBzeXN0ZW1JbWFnZU5hbWVkOkAiY2FtZXJhLmZpbGwiXSBpZGVudGlm aWVyOkAiY2FtZXJhIiBoYW5kbGVyOl4oX19raW5kb2YgVUlBY3Rpb24gKmFjdGlvbikgewogICAg ICAgICAgICAgICAgIF91c2luZ0NhbWVyYSA9IFlFUzsKKyAgICAgICAgICAgICAgICBzZWxmLT5f aXNQcmVzZW50aW5nU3ViTWVudSA9IFlFUzsKICAgICAgICAgICAgICAgICBbc2VsZiBfc2hvd1Bo b3RvUGlja2VyV2l0aFNvdXJjZVR5cGU6VUlJbWFnZVBpY2tlckNvbnRyb2xsZXJTb3VyY2VUeXBl Q2FtZXJhXTsKICAgICAgICAgICAgIH1dOwogICAgICAgICAgICAgYWN0aW9ucyA9IEBbcGhvdG9B Y3Rpb24sIGNhbWVyYUFjdGlvbiwgYnJvd3NlQWN0aW9uXTsKQEAgLTQ2NCw3ICs0NjksOCBAQCBz dGF0aWMgTlNTZXQ8TlNTdHJpbmcgKj4gKlVUSXNGb3JNSU1FVHlwZXMoTlNBcnJheSAqbWltZVR5 cGVzKQogewogICAgIFthbmltYXRvciBhZGRDb21wbGV0aW9uOl57CiAgICAgICAgIFtzZWxmIHJl bW92ZUNvbnRleHRNZW51SW50ZXJhY3Rpb25dOwotICAgICAgICBbc2VsZiBfY2FuY2VsXTsKKyAg ICAgICAgaWYgKCFzZWxmLT5faXNQcmVzZW50aW5nU3ViTWVudSkKKyAgICAgICAgICAgIFtzZWxm IF9jYW5jZWxdOwogICAgIH1dOwogfQogCkBAIC00ODEsNiArNDg3LDcgQEAgc3RhdGljIE5TU2V0 PE5TU3RyaW5nICo+ICpVVElzRm9yTUlNRVR5cGVzKE5TQXJyYXkgKm1pbWVUeXBlcykKICAgICBp ZiAoIV9kb2N1bWVudENvbnRleHRNZW51SW50ZXJhY3Rpb24pIHsKICAgICAgICAgX2RvY3VtZW50 Q29udGV4dE1lbnVJbnRlcmFjdGlvbiA9IGFkb3B0TlMoW1tVSUNvbnRleHRNZW51SW50ZXJhY3Rp b24gYWxsb2NdIGluaXRXaXRoRGVsZWdhdGU6c2VsZl0pOwogICAgICAgICBbX3ZpZXcgYWRkSW50 ZXJhY3Rpb246X2RvY3VtZW50Q29udGV4dE1lbnVJbnRlcmFjdGlvbi5nZXQoKV07CisgICAgICAg IHNlbGYtPl9pc1ByZXNlbnRpbmdTdWJNZW51ID0gTk87CiAgICAgfQogfQogCg==