70173 2011-10-15 01:14:47 -0700 REGRESSION(r97533): fast/forms/select-script-onchange.html failed after 2011-10-15 15:46:57 -0700 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P1 Critical --- 70139 1 tczene darin darin dglazkov ossy rniwa webkit.review.bot oldest_to_newest 484547 0 tczene 2011-10-15 01:14:47 -0700 --- /ramdisk/qt-linux-64-release/build/layout-test-results/fast/forms/select-script-onchange-expected.txt +++ /ramdisk/qt-linux-64-release/build/layout-test-results/fast/forms/select-script-onchange-actual.txt @@ -1,6 +1,8 @@ Test for http://bugs.webkit.org/show_bug.cgi?id=23721 Changing dropdown's selectedIndex within onchange handler fires another onchange. -SUCCESS + +FAILURE: onchange(1) called 1 times. +FAILURE: onchange(2) called 2 times. This select changes on focus: should not fire onchange. This select changes on change: should only fire onchange once. 484560 1 ossy 2011-10-15 02:13:05 -0700 It fails on SL and on Qt bot too. 484606 2 rniwa 2011-10-15 11:14:45 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=111075&action=review > Source/WebCore/html/HTMLOptionElement.cpp:192 > - HTMLSelectElement* select = ownerSelectElement(); > - if (select) > - select->childrenChanged(changedByParser); > + if (HTMLSelectElement* select = ownerSelectElement()) > + select->optionElementChildrenChanged(); Maybe this change? 484622 3 darin 2011-10-15 13:01:45 -0700 I’ll investigate now. 484630 4 111142 darin 2011-10-15 13:46:05 -0700 Created attachment 111142 Patch 484638 5 111142 webkit.review.bot 2011-10-15 14:13:10 -0700 Comment on attachment 111142 Patch Attachment 111142 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10075313 New failing tests: fast/events/popup-when-select-change.html fast/events/onchange-select-popup.html 484640 6 111145 darin 2011-10-15 14:24:34 -0700 Created attachment 111145 Patch 484641 7 111145 darin 2011-10-15 14:24:50 -0700 Comment on attachment 111145 Patch OK, lets try a more targeted fix. 484642 8 darin 2011-10-15 14:25:48 -0700 Hmmpf, even this smaller change seems to break onchange-select-popup.html 484644 9 111146 darin 2011-10-15 14:36:56 -0700 Created attachment 111146 Patch 484645 10 darin 2011-10-15 14:37:32 -0700 New patch; this one passes all the tests in fast/events. 484648 11 111146 abarth 2011-10-15 14:40:23 -0700 Comment on attachment 111146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111146&action=review > Source/WebCore/html/HTMLSelectElement.cpp:1388 > + setSelectedIndex(listToOptionIndex(index), true, false, true); IMHO, this is calling out for enum arguments. 484649 12 111146 rniwa 2011-10-15 14:40:33 -0700 Comment on attachment 111146 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111146&action=review > Source/WebCore/html/HTMLSelectElement.cpp:1009 > + setSelectedIndex(listToOptionIndex(listIndex), true, false, true); These boolean values are hurting my eyes :( 484650 13 rniwa 2011-10-15 14:41:10 -0700 (In reply to comment #11) > (From update of attachment 111146 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=111146&action=review > > > Source/WebCore/html/HTMLSelectElement.cpp:1388 > > + setSelectedIndex(listToOptionIndex(index), true, false, true); > > IMHO, this is calling out for enum arguments. I think we can all agree to that. 484656 14 darin 2011-10-15 15:03:31 -0700 Yes, we all agree. Even my ChangeLog agrees! And the patch I am working on right now, too. 484664 15 111146 webkit.review.bot 2011-10-15 15:46:52 -0700 Comment on attachment 111146 Patch Clearing flags on attachment: 111146 Committed r97565: <http://trac.webkit.org/changeset/97565> 484665 16 webkit.review.bot 2011-10-15 15:46:57 -0700 All reviewed patches have been landed. Closing bug. 111142 2011-10-15 13:46:05 -0700 2011-10-15 14:24:30 -0700 Patch bug-70173-20111015134604.patch text/plain 3729 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NTYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMTAtMTUgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjk3NTMzKTogZmFz dC9mb3Jtcy9zZWxlY3Qtc2NyaXB0LW9uY2hhbmdlLmh0bWwgZmFpbGVkIGFmdGVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDE3MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHRtbC9IVE1MU2VsZWN0 RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6c2V0VmFs dWUpOiBSZW1vdmVkIHVubmVlZGVkIGJvb2xlYW4gYXJndW1lbnQKKyAgICAgICAgW3RydWUgZm9y IGRlc2VsZWN0XS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RFbGVtZW50OjptZW51TGlz dERlZmF1bHRFdmVudEhhbmRsZXIpOiBBZGRlZCBleHBsaWNpdAorICAgICAgICBib29sZWFuIGFy Z3VtZW50IFt0cnVlIGZvciB1c2VyRHJpdmVuQ2hhbmdlXS4KKyAgICAgICAgKFdlYkNvcmU6OkhU TUxTZWxlY3RFbGVtZW50OjphY2Nlc3NLZXlTZXRTZWxlY3RlZEluZGV4KTogRGl0dG8uCisKKyAg ICAgICAgKiBodG1sL0hUTUxTZWxlY3RFbGVtZW50Lmg6CisgICAgICAgIFJlbW92ZWQgZGVmYXVs dCBvZiB0cnVlIGZvciB1c2VyRHJpdmVuQ2hhbmdlLiBFYWNoIGNhbGxlciBzaG91bGQgcGFzcyBp dAorICAgICAgICBleHBsaWNpdGx5LiBMb25nZXIgdGVybSB3ZSBzaG91bGQgdXNlIGFuIGVudW0g aW5zdGVhZCBvZiBhIGJvb2xlYW4gb3IgZmluZAorICAgICAgICBzb21lIG90aGVyIHdheSBvZiBh dm9pZGluZyB0aGUgYXJndW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVu dDo6c2V0U2VsZWN0ZWRJbmRleCk6IFRoaXMgaXMgdGhlIGFjdHVhbCBidWcgZml4LgorICAgICAg ICBQYXNzIGZhbHNlIGZvciB1c2VyRHJpdmVuQ2hhbmdlIGFzIHRoZSBvbGQgY29kZSBkaWQgcHJl LXI5NzUzMy4KKwogMjAxMS0xMC0xNSAgTGFzemxvIEdvbWJvcyAgPGxhc3psby4xLmdvbWJvc0Bu b2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBbU3ltYmlhbl0gUmVtb3ZlIHN1cHBvcnQgZm9yIHRo ZSBTeW1iaWFuIHBsYXRmb3JtIGZvciB0aGUgUXRXZWJLaXQgcG9ydApJbmRleDogU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAJKHJldmlzaW9uIDk3NTYzKQorKysgU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTIzMyw3ICsyMzMsNyBAQCB2b2lkIEhUTUxTZWxlY3RFbGVtZW50OjpzZXRWYWx1ZShjb25zdCBT CiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGl0ZW1zLnNpemUoKTsgaSsrKSB7CiAgICAg ICAgIGlmIChpdGVtc1tpXS0+aGFzTG9jYWxOYW1lKG9wdGlvblRhZykpIHsKICAgICAgICAgICAg IGlmIChzdGF0aWNfY2FzdDxIVE1MT3B0aW9uRWxlbWVudCo+KGl0ZW1zW2ldKS0+dmFsdWUoKSA9 PSB2YWx1ZSkgewotICAgICAgICAgICAgICAgIHNldFNlbGVjdGVkSW5kZXgob3B0aW9uSW5kZXgs IHRydWUpOworICAgICAgICAgICAgICAgIHNldFNlbGVjdGVkSW5kZXgob3B0aW9uSW5kZXgpOwog ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIG9wdGlv bkluZGV4Kys7CkBAIC0xMDczLDcgKzEwNzMsNyBAQCB2b2lkIEhUTUxTZWxlY3RFbGVtZW50Ojpt ZW51TGlzdERlZmF1bHRFCiAgICAgICAgIGludCBsaXN0SW5kZXggPSBvcHRpb25Ub0xpc3RJbmRl eChzZWxlY3RlZEluZGV4KCkpOwogICAgICAgICBpZiAoa2V5Q29kZSA9PSAnXHInKSB7CiAgICAg ICAgICAgICAvLyBsaXN0SW5kZXggc2hvdWxkIGFscmVhZHkgYmUgc2VsZWN0ZWQsIGJ1dCB0aGlz IHdpbGwgZmlyZSB0aGUgb25jaGFuZ2UgaGFuZGxlci4KLSAgICAgICAgICAgIHNldFNlbGVjdGVk SW5kZXgobGlzdFRvT3B0aW9uSW5kZXgobGlzdEluZGV4KSwgdHJ1ZSwgdHJ1ZSk7CisgICAgICAg ICAgICBzZXRTZWxlY3RlZEluZGV4KGxpc3RUb09wdGlvbkluZGV4KGxpc3RJbmRleCksIHRydWUs IHRydWUsIHRydWUpOwogICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CiAgICAgICAgIH0KICNl bmRpZgpAQCAtMTQxOCw3ICsxNDE4LDcgQEAgdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6YWNjZXNz S2V5U2V0U2VsZQogICAgICAgICBpZiAob3B0aW9uRWxlbWVudC0+c2VsZWN0ZWQoKSkKICAgICAg ICAgICAgIG9wdGlvbkVsZW1lbnQtPnNldFNlbGVjdGVkU3RhdGUoZmFsc2UpOwogICAgICAgICBl bHNlCi0gICAgICAgICAgICBzZXRTZWxlY3RlZEluZGV4KGluZGV4LCBmYWxzZSwgdHJ1ZSk7Cisg ICAgICAgICAgICBzZXRTZWxlY3RlZEluZGV4KGluZGV4LCBmYWxzZSwgdHJ1ZSwgdHJ1ZSk7CiAg ICAgfQogCiAgICAgaWYgKHVzZXNNZW51TGlzdCgpKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MU2VsZWN0RWxlbWVudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTFNlbGVjdEVsZW1lbnQuaAkocmV2aXNpb24gOTc1NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxTZWxlY3RFbGVtZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTEzOSw3ICsxMzksNyBA QCBwcml2YXRlOgogCiAgICAgYm9vbCBoYXNQbGFjZWhvbGRlckxhYmVsT3B0aW9uKCkgY29uc3Q7 CiAKLSAgICB2b2lkIHNldFNlbGVjdGVkSW5kZXgoaW50IG9wdGlvbkluZGV4LCBib29sIGRlc2Vs ZWN0LCBib29sIGZpcmVPbkNoYW5nZU5vdywgYm9vbCB1c2VyRHJpdmVuQ2hhbmdlID0gdHJ1ZSk7 CisgICAgdm9pZCBzZXRTZWxlY3RlZEluZGV4KGludCBvcHRpb25JbmRleCwgYm9vbCBkZXNlbGVj dCwgYm9vbCBmaXJlT25DaGFuZ2VOb3csIGJvb2wgdXNlckRyaXZlbkNoYW5nZSk7CiAgICAgdm9p ZCBkZXNlbGVjdEl0ZW1zV2l0aG91dFZhbGlkYXRpb24oRWxlbWVudCogZXhjbHVkZUVsZW1lbnQg PSAwKTsKICAgICB2b2lkIHBhcnNlTXVsdGlwbGVBdHRyaWJ1dGUoY29uc3QgQXR0cmlidXRlKik7 CiAgICAgaW50IGxhc3RTZWxlY3RlZExpc3RJbmRleCgpIGNvbnN0OwpAQCAtMTgzLDcgKzE4Myw3 IEBAIHByaXZhdGU6CiAKIGlubGluZSB2b2lkIEhUTUxTZWxlY3RFbGVtZW50OjpzZXRTZWxlY3Rl ZEluZGV4KGludCBpbmRleCwgYm9vbCBkZXNlbGVjdCkKIHsKLSAgICBzZXRTZWxlY3RlZEluZGV4 KGluZGV4LCBkZXNlbGVjdCwgZmFsc2UpOworICAgIHNldFNlbGVjdGVkSW5kZXgoaW5kZXgsIGRl c2VsZWN0LCBmYWxzZSwgZmFsc2UpOwogfQogCiBpbmxpbmUgYm9vbCBIVE1MU2VsZWN0RWxlbWVu dDo6dXNlc01lbnVMaXN0KCkgY29uc3QK 111145 2011-10-15 14:24:34 -0700 2011-10-15 14:36:52 -0700 Patch bug-70173-20111015142433.patch text/plain 1246 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NTYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTAtMTUgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjk3NTMzKTogZmFz dC9mb3Jtcy9zZWxlY3Qtc2NyaXB0LW9uY2hhbmdlLmh0bWwgZmFpbGVkIGFmdGVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDE3MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHRtbC9IVE1MU2VsZWN0 RWxlbWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNlbGVjdEVsZW1lbnQ6OnNldFNlbGVj dGVkSW5kZXgpOgorICAgICAgICBQYXNzIGZhbHNlIGZvciB1c2VyRHJpdmVuQ2hhbmdlIGFzIHRo ZSBvbGQgY29kZSBkaWQgcHJlLXI5NzUzMy4KKwogMjAxMS0xMC0xNSAgTGFzemxvIEdvbWJvcyAg PGxhc3psby4xLmdvbWJvc0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBbU3ltYmlhbl0gUmVt b3ZlIHN1cHBvcnQgZm9yIHRoZSBTeW1iaWFuIHBsYXRmb3JtIGZvciB0aGUgUXRXZWJLaXQgcG9y dApJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuaAkocmV2aXNpb24g OTc1NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmgJKHdvcmtp bmcgY29weSkKQEAgLTE4Myw3ICsxODMsNyBAQCBwcml2YXRlOgogCiBpbmxpbmUgdm9pZCBIVE1M U2VsZWN0RWxlbWVudDo6c2V0U2VsZWN0ZWRJbmRleChpbnQgaW5kZXgsIGJvb2wgZGVzZWxlY3Qp CiB7Ci0gICAgc2V0U2VsZWN0ZWRJbmRleChpbmRleCwgZGVzZWxlY3QsIGZhbHNlKTsKKyAgICBz ZXRTZWxlY3RlZEluZGV4KGluZGV4LCBkZXNlbGVjdCwgZmFsc2UsIGZhbHNlKTsKIH0KIAogaW5s aW5lIGJvb2wgSFRNTFNlbGVjdEVsZW1lbnQ6OnVzZXNNZW51TGlzdCgpIGNvbnN0Cg== 111146 2011-10-15 14:36:56 -0700 2011-10-15 15:46:51 -0700 Patch bug-70173-20111015143655.patch text/plain 4705 darin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NTYzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTEtMTAtMTUgIERhcmluIEFk bGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT04ocjk3NTMzKTogZmFz dC9mb3Jtcy9zZWxlY3Qtc2NyaXB0LW9uY2hhbmdlLmh0bWwgZmFpbGVkIGFmdGVyCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDE3MworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHRtbC9IVE1MU2VsZWN0 RWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6c2V0VmFs dWUpOiBSZW1vdmVkIHVubmVlZGVkIGJvb2xlYW4gYXJndW1lbnQKKyAgICAgICAgW3RydWUgZm9y IGRlc2VsZWN0XS4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RFbGVtZW50OjptZW51TGlz dERlZmF1bHRFdmVudEhhbmRsZXIpOiBBZGRlZCBleHBsaWNpdAorICAgICAgICBib29sZWFuIGFy Z3VtZW50cyBmb3IgYWxsIGNhbGxzIHRvIHNldFNlbGVjdGVkSW5kZXggdG8gcmVzdG9yZSBwcmUt cjk3NTMzCisgICAgICAgIGJlaGF2aW9yLgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNlbGVjdEVs ZW1lbnQ6OnR5cGVBaGVhZEZpbmQpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxl Y3RFbGVtZW50OjphY2Nlc3NLZXlTZXRTZWxlY3RlZEluZGV4KTogRGl0dG8uCisKKyAgICAgICAg KiBodG1sL0hUTUxTZWxlY3RFbGVtZW50Lmg6CisgICAgICAgIFJlbW92ZWQgZGVmYXVsdCBvZiB0 cnVlIGZvciB1c2VyRHJpdmVuQ2hhbmdlLiBFYWNoIGNhbGxlciBzaG91bGQgcGFzcyBpdAorICAg ICAgICBleHBsaWNpdGx5LiBMb25nZXIgdGVybSB3ZSBzaG91bGQgdXNlIGFuIGVudW0gaW5zdGVh ZCBvZiBhIGJvb2xlYW4gb3IgZmluZAorICAgICAgICBzb21lIG90aGVyIHdheSBvZiBhdm9pZGlu ZyB0aGUgYXJndW1lbnQuCisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6c2V0 U2VsZWN0ZWRJbmRleCk6CisgICAgICAgIFBhc3MgZmFsc2UgZm9yIHVzZXJEcml2ZW5DaGFuZ2Ug YXMgdGhlIG9sZCBjb2RlIGRpZCBwcmUtcjk3NTMzLgorCiAyMDExLTEwLTE1ICBMYXN6bG8gR29t Ym9zICA8bGFzemxvLjEuZ29tYm9zQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIFtTeW1iaWFu XSBSZW1vdmUgc3VwcG9ydCBmb3IgdGhlIFN5bWJpYW4gcGxhdGZvcm0gZm9yIHRoZSBRdFdlYktp dCBwb3J0CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAko cmV2aXNpb24gOTc1NjMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50 LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjMzLDcgKzIzMyw3IEBAIHZvaWQgSFRNTFNlbGVjdEVs ZW1lbnQ6OnNldFZhbHVlKGNvbnN0IFMKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgaXRl bXMuc2l6ZSgpOyBpKyspIHsKICAgICAgICAgaWYgKGl0ZW1zW2ldLT5oYXNMb2NhbE5hbWUob3B0 aW9uVGFnKSkgewogICAgICAgICAgICAgaWYgKHN0YXRpY19jYXN0PEhUTUxPcHRpb25FbGVtZW50 Kj4oaXRlbXNbaV0pLT52YWx1ZSgpID09IHZhbHVlKSB7Ci0gICAgICAgICAgICAgICAgc2V0U2Vs ZWN0ZWRJbmRleChvcHRpb25JbmRleCwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgc2V0U2VsZWN0 ZWRJbmRleChvcHRpb25JbmRleCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAg ICAgfQogICAgICAgICAgICAgb3B0aW9uSW5kZXgrKzsKQEAgLTEwMDYsNyArMTAwNiw3IEBAIHZv aWQgSFRNTFNlbGVjdEVsZW1lbnQ6Om1lbnVMaXN0RGVmYXVsdEUKICAgICAgICAgICAgIGhhbmRs ZWQgPSBmYWxzZTsKIAogICAgICAgICBpZiAoaGFuZGxlZCAmJiBzdGF0aWNfY2FzdDxzaXplX3Q+ KGxpc3RJbmRleCkgPCBsaXN0SXRlbXMuc2l6ZSgpKQotICAgICAgICAgICAgc2V0U2VsZWN0ZWRJ bmRleChsaXN0VG9PcHRpb25JbmRleChsaXN0SW5kZXgpKTsKKyAgICAgICAgICAgIHNldFNlbGVj dGVkSW5kZXgobGlzdFRvT3B0aW9uSW5kZXgobGlzdEluZGV4KSwgdHJ1ZSwgZmFsc2UsIHRydWUp OwogCiAgICAgICAgIGlmIChoYW5kbGVkKQogICAgICAgICAgICAgZXZlbnQtPnNldERlZmF1bHRI YW5kbGVkKCk7CkBAIC0xMDczLDcgKzEwNzMsNyBAQCB2b2lkIEhUTUxTZWxlY3RFbGVtZW50Ojpt ZW51TGlzdERlZmF1bHRFCiAgICAgICAgIGludCBsaXN0SW5kZXggPSBvcHRpb25Ub0xpc3RJbmRl eChzZWxlY3RlZEluZGV4KCkpOwogICAgICAgICBpZiAoa2V5Q29kZSA9PSAnXHInKSB7CiAgICAg ICAgICAgICAvLyBsaXN0SW5kZXggc2hvdWxkIGFscmVhZHkgYmUgc2VsZWN0ZWQsIGJ1dCB0aGlz IHdpbGwgZmlyZSB0aGUgb25jaGFuZ2UgaGFuZGxlci4KLSAgICAgICAgICAgIHNldFNlbGVjdGVk SW5kZXgobGlzdFRvT3B0aW9uSW5kZXgobGlzdEluZGV4KSwgdHJ1ZSwgdHJ1ZSk7CisgICAgICAg ICAgICBzZXRTZWxlY3RlZEluZGV4KGxpc3RUb09wdGlvbkluZGV4KGxpc3RJbmRleCksIHRydWUs IHRydWUsIHRydWUpOwogICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CiAgICAgICAgIH0KICNl bmRpZgpAQCAtMTM4NSw3ICsxMzg1LDcgQEAgdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6dHlwZUFo ZWFkRmluZChLZQogICAgICAgICAvLyBGb2xkIHRoZSBvcHRpb24gc3RyaW5nIGFuZCBjaGVjayBp ZiBpdHMgcHJlZml4IGlzIGVxdWFsIHRvIHRoZSBmb2xkZWQgcHJlZml4LgogICAgICAgICBTdHJp bmcgdGV4dCA9IG9wdGlvbkVsZW1lbnQtPnRleHRJbmRlbnRlZFRvUmVzcGVjdEdyb3VwTGFiZWwo KTsKICAgICAgICAgaWYgKHN0cmlwTGVhZGluZ1doaXRlU3BhY2UodGV4dCkuZm9sZENhc2UoKS5z dGFydHNXaXRoKHByZWZpeFdpdGhDYXNlRm9sZGVkKSkgewotICAgICAgICAgICAgc2V0U2VsZWN0 ZWRJbmRleChsaXN0VG9PcHRpb25JbmRleChpbmRleCkpOworICAgICAgICAgICAgc2V0U2VsZWN0 ZWRJbmRleChsaXN0VG9PcHRpb25JbmRleChpbmRleCksIHRydWUsIGZhbHNlLCB0cnVlKTsKICAg ICAgICAgICAgIGlmICghdXNlc01lbnVMaXN0KCkpCiAgICAgICAgICAgICAgICAgbGlzdEJveE9u Q2hhbmdlKCk7CiAKQEAgLTE0MTgsNyArMTQxOCw3IEBAIHZvaWQgSFRNTFNlbGVjdEVsZW1lbnQ6 OmFjY2Vzc0tleVNldFNlbGUKICAgICAgICAgaWYgKG9wdGlvbkVsZW1lbnQtPnNlbGVjdGVkKCkp CiAgICAgICAgICAgICBvcHRpb25FbGVtZW50LT5zZXRTZWxlY3RlZFN0YXRlKGZhbHNlKTsKICAg ICAgICAgZWxzZQotICAgICAgICAgICAgc2V0U2VsZWN0ZWRJbmRleChpbmRleCwgZmFsc2UsIHRy dWUpOworICAgICAgICAgICAgc2V0U2VsZWN0ZWRJbmRleChpbmRleCwgZmFsc2UsIHRydWUsIHRy dWUpOwogICAgIH0KIAogICAgIGlmICh1c2VzTWVudUxpc3QoKSkKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTFNlbGVjdEVsZW1lbnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmgJKHJldmlzaW9uIDk3NTYzKQorKysgU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MU2VsZWN0RWxlbWVudC5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzksNyAr MTM5LDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgaGFzUGxhY2Vob2xkZXJMYWJlbE9wdGlvbigp IGNvbnN0OwogCi0gICAgdm9pZCBzZXRTZWxlY3RlZEluZGV4KGludCBvcHRpb25JbmRleCwgYm9v bCBkZXNlbGVjdCwgYm9vbCBmaXJlT25DaGFuZ2VOb3csIGJvb2wgdXNlckRyaXZlbkNoYW5nZSA9 IHRydWUpOworICAgIHZvaWQgc2V0U2VsZWN0ZWRJbmRleChpbnQgb3B0aW9uSW5kZXgsIGJvb2wg ZGVzZWxlY3QsIGJvb2wgZmlyZU9uQ2hhbmdlTm93LCBib29sIHVzZXJEcml2ZW5DaGFuZ2UpOwog ICAgIHZvaWQgZGVzZWxlY3RJdGVtc1dpdGhvdXRWYWxpZGF0aW9uKEVsZW1lbnQqIGV4Y2x1ZGVF bGVtZW50ID0gMCk7CiAgICAgdm9pZCBwYXJzZU11bHRpcGxlQXR0cmlidXRlKGNvbnN0IEF0dHJp YnV0ZSopOwogICAgIGludCBsYXN0U2VsZWN0ZWRMaXN0SW5kZXgoKSBjb25zdDsKQEAgLTE4Myw3 ICsxODMsNyBAQCBwcml2YXRlOgogCiBpbmxpbmUgdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6c2V0 U2VsZWN0ZWRJbmRleChpbnQgaW5kZXgsIGJvb2wgZGVzZWxlY3QpCiB7Ci0gICAgc2V0U2VsZWN0 ZWRJbmRleChpbmRleCwgZGVzZWxlY3QsIGZhbHNlKTsKKyAgICBzZXRTZWxlY3RlZEluZGV4KGlu ZGV4LCBkZXNlbGVjdCwgZmFsc2UsIGZhbHNlKTsKIH0KIAogaW5saW5lIGJvb2wgSFRNTFNlbGVj dEVsZW1lbnQ6OnVzZXNNZW51TGlzdCgpIGNvbnN0Cg==