126366 2014-01-01 15:12:40 -0800 Remove reattachRenderTree 2022-07-30 13:27:46 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned ahmad.saleem792 ap bfulgham rniwa oldest_to_newest 963637 0 koivisto 2014-01-01 15:12:40 -0800 Remove the last remaining client. 963642 1 220196 koivisto 2014-01-01 15:18:10 -0800 Created attachment 220196 patch 963643 2 220196 kling 2014-01-01 15:22:50 -0800 Comment on attachment 220196 patch View in context: https://bugs.webkit.org/attachment.cgi?id=220196&action=review r=me > Source/WebCore/html/HTMLSelectElement.cpp:1264 > + RenderMenuList* menuList = toRenderMenuList(renderer()); I'd make this a RenderMenuList& 963678 3 220196 darin 2014-01-01 21:36:51 -0800 Comment on attachment 220196 patch View in context: https://bugs.webkit.org/attachment.cgi?id=220196&action=review > Source/WebCore/html/HTMLSelectElement.cpp:1144 > + ASSERT(renderer() && renderer()->isMenuList()); Any time we write an ASSERT that would have a "&&" we normally break it into two assertions. That way we can trivially tell which clause is failing if the assertion is hit. 1887845 4 ahmad.saleem792 2022-07-30 06:33:23 -0700 I think this got landed in this commit: https://github.com/WebKit/WebKit/commit/86fe1d37c2f5fde8ee8467e98d2d9e76251194c6 Can this be marked as "RESOLVED FIXED"? Thanks! 1887891 5 rniwa 2022-07-30 13:27:46 -0700 Indeed, this patch got landed. 220196 2014-01-01 15:18:10 -0800 2014-01-01 21:36:51 -0800 patch remove-reattach.patch text/plain 10006 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MTE5NikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE0LTAxLTAxICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgcmVhdHRhY2hSZW5k ZXJUcmVlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjYzNjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBS ZW1vdmUgdGhlIGxhc3QgcmVtYWluaW5nIGNsaWVudC4KKworICAgICAgICAqIGh0bWwvSFRNTFNl bGVjdEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNlbGVjdEVsZW1lbnQ6OnBh cnNlQXR0cmlidXRlKToKKyAgICAgICAgCisgICAgICAgICAgICBSZWNvbnN0cnVjdCByZW5kZXIg dHJlZSBhc3luY2hyb25vdXNseS4KKworICAgICAgICAoV2ViQ29yZTo6SFRNTFNlbGVjdEVsZW1l bnQ6OnNjcm9sbFRvU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxTZWxlY3RFbGVt ZW50OjpzZXRPcHRpb25zQ2hhbmdlZE9uUmVuZGVyZXIpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFNlbGVjdEVsZW1lbnQ6OnNlbGVjdE9wdGlvbik6CisgICAgICAgIAorICAgICAgICAgICAgSXQg aXMgbm90IHNhZmUgdG8gY2FzdCB0aGUgcmVuZGVyZXIgYmFzZWQgb24gdXNlc01lbnVMaXN0IHRl c3QuIFN3aXRjaCB0byBSZW5kZXJPYmplY3Q6OmlzTWVudUxpc3QgdGVzdC4KKworICAgICAgICAo V2ViQ29yZTo6SFRNTFNlbGVjdEVsZW1lbnQ6OnBhcnNlTXVsdGlwbGVBdHRyaWJ1dGUpOgorICAg ICAgICAKKyAgICAgICAgICAgIFJlY29uc3RydWN0IHJlbmRlciB0cmVlIGFzeW5jaHJvbm91c2x5 LgorCisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxlbWVudDo6cGxhdGZvcm1IYW5kbGVL ZXlkb3duRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFNlbGVjdEVsZW1lbnQ6Om1lbnVM aXN0RGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpIVE1MU2VsZWN0RWxl bWVudDo6ZGVmYXVsdEV2ZW50SGFuZGxlcik6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZl VHJlZS5jcHA6CisgICAgICAgICogc3R5bGUvU3R5bGVSZXNvbHZlVHJlZS5oOgorICAgICAgICAK KyAgICAgICAgICAgIFJlbW92ZSB0aGUgZnVuY3Rpb24uCisKIDIwMTQtMDEtMDEgIEFudHRpIEtv aXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBlbGVtZW50Q2hpbGRy ZW4vZWxlbWVudERlc2NlbmRhbnRzIHNob3J0aGFuZHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFNlbGVjdEVsZW1lbnQuY3BwCShyZXZpc2lvbiAxNjExOTQpCisrKyBTb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxTZWxlY3RFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzE1LDgg KzMxNSw4IEBAIHZvaWQgSFRNTFNlbGVjdEVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKGMKIAogICAg ICAgICBtX3NpemUgPSBzaXplOwogICAgICAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2soKTsKLSAg ICAgICAgaWYgKG1fc2l6ZSAhPSBvbGRTaXplICYmIHJlbmRlcmVyKCkpIHsKLSAgICAgICAgICAg IFN0eWxlOjpyZWF0dGFjaFJlbmRlclRyZWUoKnRoaXMpOworICAgICAgICBpZiAobV9zaXplICE9 IG9sZFNpemUpIHsKKyAgICAgICAgICAgIHNldE5lZWRzU3R5bGVSZWNhbGMoUmVjb25zdHJ1Y3RS ZW5kZXJUcmVlKTsKICAgICAgICAgICAgIHNldFJlY2FsY0xpc3RJdGVtcygpOwogICAgICAgICB9 CiAgICAgfSBlbHNlIGlmIChuYW1lID09IG11bHRpcGxlQXR0cikKQEAgLTcwOCw4ICs3MDgsMTAg QEAgdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6c2Nyb2xsVG9TZWxlY3RpbwogICAgIGlmICh1c2Vz TWVudUxpc3QoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKGF1dG8gcmVuZGVyZXIgPSB0 aGlzLT5yZW5kZXJlcigpKQotICAgICAgICB0b1JlbmRlckxpc3RCb3gocmVuZGVyZXIpLT5zZWxl Y3Rpb25DaGFuZ2VkKCk7CisgICAgYXV0byByZW5kZXJlciA9IHRoaXMtPnJlbmRlcmVyKCk7Cisg ICAgaWYgKCFyZW5kZXJlciB8fCAhcmVuZGVyZXItPmlzTGlzdEJveCgpKQorICAgICAgICByZXR1 cm47CisgICAgdG9SZW5kZXJMaXN0Qm94KHJlbmRlcmVyKS0+c2VsZWN0aW9uQ2hhbmdlZCgpOwog I2Vsc2UKICAgICBpZiAoYXV0byByZW5kZXJlciA9IHRoaXMtPnJlbmRlcmVyKCkpCiAgICAgICAg IHJlbmRlcmVyLT5yZXBhaW50KCk7CkBAIC03MjAsNyArNzIyLDcgQEAgdm9pZCBIVE1MU2VsZWN0 RWxlbWVudDo6c2V0T3B0aW9uc0NoYW5nZQogewogICAgIGlmIChhdXRvIHJlbmRlcmVyID0gdGhp cy0+cmVuZGVyZXIoKSkgewogI2lmICFQTEFURk9STShJT1MpCi0gICAgICAgIGlmICh1c2VzTWVu dUxpc3QoKSkKKyAgICAgICAgaWYgKHJlbmRlcmVyLT5pc01lbnVMaXN0KCkpCiAgICAgICAgICAg ICB0b1JlbmRlck1lbnVMaXN0KHJlbmRlcmVyKS0+c2V0T3B0aW9uc0NoYW5nZWQodHJ1ZSk7CiAg ICAgICAgIGVsc2UKICAgICAgICAgICAgIHRvUmVuZGVyTGlzdEJveChyZW5kZXJlciktPnNldE9w dGlvbnNDaGFuZ2VkKHRydWUpOwpAQCAtODk4LDkgKzkwMCw5IEBAIHZvaWQgSFRNTFNlbGVjdEVs ZW1lbnQ6OnNlbGVjdE9wdGlvbihpbnQKICAgICAgICAgaWYgKGZsYWdzICYgRGlzcGF0Y2hDaGFu Z2VFdmVudCkKICAgICAgICAgICAgIGRpc3BhdGNoQ2hhbmdlRXZlbnRGb3JNZW51TGlzdCgpOwog ICAgICAgICBpZiAoYXV0byByZW5kZXJlciA9IHRoaXMtPnJlbmRlcmVyKCkpIHsKLSAgICAgICAg ICAgIGlmICh1c2VzTWVudUxpc3QoKSkKKyAgICAgICAgICAgIGlmIChyZW5kZXJlci0+aXNNZW51 TGlzdCgpKQogICAgICAgICAgICAgICAgIHRvUmVuZGVyTWVudUxpc3QocmVuZGVyZXIpLT5kaWRT ZXRTZWxlY3RlZEluZGV4KGxpc3RJbmRleCk7Ci0gICAgICAgICAgICBlbHNlIGlmIChyZW5kZXJl ci0+aXNMaXN0Qm94KCkpCisgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgdG9SZW5k ZXJMaXN0Qm94KHJlbmRlcmVyKS0+c2VsZWN0aW9uQ2hhbmdlZCgpOwogICAgICAgICB9CiAgICAg fQpAQCAtMTA0Niw4ICsxMDQ4LDggQEAgdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6cGFyc2VNdWx0 aXBsZUF0dAogICAgIGJvb2wgb2xkVXNlc01lbnVMaXN0ID0gdXNlc01lbnVMaXN0KCk7CiAgICAg bV9tdWx0aXBsZSA9ICF2YWx1ZS5pc051bGwoKTsKICAgICBzZXROZWVkc1ZhbGlkaXR5Q2hlY2so KTsKLSAgICBpZiAob2xkVXNlc01lbnVMaXN0ICE9IHVzZXNNZW51TGlzdCgpICYmIHJlbmRlcmVy KCkpCi0gICAgICAgIFN0eWxlOjpyZWF0dGFjaFJlbmRlclRyZWUoKnRoaXMpOworICAgIGlmIChv bGRVc2VzTWVudUxpc3QgIT0gdXNlc01lbnVMaXN0KCkpCisgICAgICAgIHNldE5lZWRzU3R5bGVS ZWNhbGMoUmVjb25zdHJ1Y3RSZW5kZXJUcmVlKTsKIH0KIAogYm9vbCBIVE1MU2VsZWN0RWxlbWVu dDo6YXBwZW5kRm9ybURhdGEoRm9ybURhdGFMaXN0JiBsaXN0LCBib29sKQpAQCAtMTExOSw3ICsx MTIxLDcgQEAgYm9vbCBIVE1MU2VsZWN0RWxlbWVudDo6cGxhdGZvcm1IYW5kbGVLZQogICAgICAg ICAgICAgLy8gQ2FsbGluZyBmb2N1cygpIG1heSBjYXVzZSB1cyB0byBsb3NlIG91ciByZW5kZXJl ci4gUmV0dXJuIHRydWUgc28KICAgICAgICAgICAgIC8vIHRoYXQgb3VyIGNhbGxlciBkb2Vzbid0 IHByb2Nlc3MgdGhlIGV2ZW50IGZ1cnRoZXIsIGJ1dCBkb24ndCBzZXQKICAgICAgICAgICAgIC8v IHRoZSBldmVudCBhcyBoYW5kbGVkLgotICAgICAgICAgICAgaWYgKCFyZW5kZXJlcigpKQorICAg ICAgICAgICAgaWYgKCFyZW5kZXJlcigpIHx8ICFyZW5kZXJlcigpLT5pc01lbnVMaXN0KCkpCiAg ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNl bGVjdGlvbiBzbyBpdCBjYW4gYmUgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24KQEAgLTEx MjcsOCArMTEyOSw3IEBAIGJvb2wgSFRNTFNlbGVjdEVsZW1lbnQ6OnBsYXRmb3JtSGFuZGxlS2UK ICAgICAgICAgICAgIC8vIGdldHMgY2FsbGVkIGZyb20gUmVuZGVyTWVudUxpc3Q6OnZhbHVlQ2hh bmdlZCwgd2hpY2ggZ2V0cyBjYWxsZWQKICAgICAgICAgICAgIC8vIGFmdGVyIHRoZSB1c2VyIG1h a2VzIGEgc2VsZWN0aW9uIGZyb20gdGhlIG1lbnUuCiAgICAgICAgICAgICBzYXZlTGFzdFNlbGVj dGlvbigpOwotICAgICAgICAgICAgaWYgKFJlbmRlck1lbnVMaXN0KiBtZW51TGlzdCA9IHRvUmVu ZGVyTWVudUxpc3QocmVuZGVyZXIoKSkpCi0gICAgICAgICAgICAgICAgbWVudUxpc3QtPnNob3dQ b3B1cCgpOworICAgICAgICAgICAgdG9SZW5kZXJNZW51TGlzdChyZW5kZXJlcigpKS0+c2hvd1Bv cHVwKCk7CiAgICAgICAgICAgICBldmVudC0+c2V0RGVmYXVsdEhhbmRsZWQoKTsKICAgICAgICAg fQogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTExNDAsMTEgKzExNDEsMTMgQEAgYm9vbCBIVE1M U2VsZWN0RWxlbWVudDo6cGxhdGZvcm1IYW5kbGVLZQogCiB2b2lkIEhUTUxTZWxlY3RFbGVtZW50 OjptZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogeworICAgIEFTU0VS VChyZW5kZXJlcigpICYmIHJlbmRlcmVyKCktPmlzTWVudUxpc3QoKSk7CisKICAgICBjb25zdCBQ YWdlKiBwYWdlID0gZG9jdW1lbnQoKS5wYWdlKCk7CiAgICAgUmVmUHRyPFJlbmRlclRoZW1lPiBy ZW5kZXJUaGVtZSA9IHBhZ2UgPyAmcGFnZS0+dGhlbWUoKSA6IFJlbmRlclRoZW1lOjpkZWZhdWx0 VGhlbWUoKTsKIAogICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5rZXlkb3du RXZlbnQpIHsKLSAgICAgICAgaWYgKCFyZW5kZXJlcigpIHx8ICFldmVudC0+aXNLZXlib2FyZEV2 ZW50KCkpCisgICAgICAgIGlmICghZXZlbnQtPmlzS2V5Ym9hcmRFdmVudCgpKQogICAgICAgICAg ICAgcmV0dXJuOwogCiAgICAgICAgIGlmIChwbGF0Zm9ybUhhbmRsZUtleWRvd25FdmVudChzdGF0 aWNfY2FzdDxLZXlib2FyZEV2ZW50Kj4oZXZlbnQpKSkKQEAgLTExOTYsNyArMTE5OSw3IEBAIHZv aWQgSFRNTFNlbGVjdEVsZW1lbnQ6Om1lbnVMaXN0RGVmYXVsdEUKICAgICAvLyBVc2Uga2V5IHBy ZXNzIGV2ZW50IGhlcmUgc2luY2Ugc2VuZGluZyBzaW11bGF0ZWQgbW91c2UgZXZlbnRzCiAgICAg Ly8gb24ga2V5IGRvd24gYmxvY2tzIHRoZSBwcm9wZXIgc2VuZGluZyBvZiB0aGUga2V5IHByZXNz IGV2ZW50LgogICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5rZXlwcmVzc0V2 ZW50KSB7Ci0gICAgICAgIGlmICghcmVuZGVyZXIoKSB8fCAhZXZlbnQtPmlzS2V5Ym9hcmRFdmVu dCgpKQorICAgICAgICBpZiAoIWV2ZW50LT5pc0tleWJvYXJkRXZlbnQoKSkKICAgICAgICAgICAg IHJldHVybjsKIAogICAgICAgICBpbnQga2V5Q29kZSA9IHN0YXRpY19jYXN0PEtleWJvYXJkRXZl bnQqPihldmVudCktPmtleUNvZGUoKTsKQEAgLTEyMjMsOCArMTIyNiw3IEBAIHZvaWQgSFRNTFNl bGVjdEVsZW1lbnQ6Om1lbnVMaXN0RGVmYXVsdEUKICAgICAgICAgICAgICAgICAvLyBnZXRzIGNh bGxlZCBmcm9tIFJlbmRlck1lbnVMaXN0Ojp2YWx1ZUNoYW5nZWQsIHdoaWNoIGdldHMgY2FsbGVk CiAgICAgICAgICAgICAgICAgLy8gYWZ0ZXIgdGhlIHVzZXIgbWFrZXMgYSBzZWxlY3Rpb24gZnJv bSB0aGUgbWVudS4KICAgICAgICAgICAgICAgICBzYXZlTGFzdFNlbGVjdGlvbigpOwotICAgICAg ICAgICAgICAgIGlmIChSZW5kZXJNZW51TGlzdCogbWVudUxpc3QgPSB0b1JlbmRlck1lbnVMaXN0 KHJlbmRlcmVyKCkpKQotICAgICAgICAgICAgICAgICAgICBtZW51TGlzdC0+c2hvd1BvcHVwKCk7 CisgICAgICAgICAgICAgICAgdG9SZW5kZXJNZW51TGlzdChyZW5kZXJlcigpKS0+c2hvd1BvcHVw KCk7CiAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0gZWxzZSBpZiAocmVuZGVyVGhlbWUtPnBvcHNNZW51QnlBcnJvd0tleXMoKSkgewpAQCAt MTI0MSw4ICsxMjQzLDcgQEAgdm9pZCBIVE1MU2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0 RQogICAgICAgICAgICAgICAgIC8vIGdldHMgY2FsbGVkIGZyb20gUmVuZGVyTWVudUxpc3Q6OnZh bHVlQ2hhbmdlZCwgd2hpY2ggZ2V0cyBjYWxsZWQKICAgICAgICAgICAgICAgICAvLyBhZnRlciB0 aGUgdXNlciBtYWtlcyBhIHNlbGVjdGlvbiBmcm9tIHRoZSBtZW51LgogICAgICAgICAgICAgICAg IHNhdmVMYXN0U2VsZWN0aW9uKCk7Ci0gICAgICAgICAgICAgICAgaWYgKFJlbmRlck1lbnVMaXN0 KiBtZW51TGlzdCA9IHRvUmVuZGVyTWVudUxpc3QocmVuZGVyZXIoKSkpCi0gICAgICAgICAgICAg ICAgICAgIG1lbnVMaXN0LT5zaG93UG9wdXAoKTsKKyAgICAgICAgICAgICAgICB0b1JlbmRlck1l bnVMaXN0KHJlbmRlcmVyKCkpLT5zaG93UG9wdXAoKTsKICAgICAgICAgICAgICAgICBoYW5kbGVk ID0gdHJ1ZTsKICAgICAgICAgICAgIH0gZWxzZSBpZiAoa2V5Q29kZSA9PSAnXHInKSB7CiAgICAg ICAgICAgICAgICAgaWYgKGZvcm0oKSkKQEAgLTEyNjAsMTggKzEyNjEsMTcgQEAgdm9pZCBIVE1M U2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0RQogICAgICAgICBmb2N1cygpOwogI2lmICFQ TEFURk9STShJT1MpCiAgICAgICAgIGlmIChyZW5kZXJlcigpICYmIHJlbmRlcmVyKCktPmlzTWVu dUxpc3QoKSkgewotICAgICAgICAgICAgaWYgKFJlbmRlck1lbnVMaXN0KiBtZW51TGlzdCA9IHRv UmVuZGVyTWVudUxpc3QocmVuZGVyZXIoKSkpIHsKLSAgICAgICAgICAgICAgICBpZiAobWVudUxp c3QtPnBvcHVwSXNWaXNpYmxlKCkpCi0gICAgICAgICAgICAgICAgICAgIG1lbnVMaXN0LT5oaWRl UG9wdXAoKTsKLSAgICAgICAgICAgICAgICBlbHNlIHsKLSAgICAgICAgICAgICAgICAgICAgLy8g U2F2ZSB0aGUgc2VsZWN0aW9uIHNvIGl0IGNhbiBiZSBjb21wYXJlZCB0byB0aGUgbmV3Ci0gICAg ICAgICAgICAgICAgICAgIC8vIHNlbGVjdGlvbiB3aGVuIHdlIGNhbGwgb25DaGFuZ2UgZHVyaW5n IHNlbGVjdE9wdGlvbiwKLSAgICAgICAgICAgICAgICAgICAgLy8gd2hpY2ggZ2V0cyBjYWxsZWQg ZnJvbSBSZW5kZXJNZW51TGlzdDo6dmFsdWVDaGFuZ2VkLAotICAgICAgICAgICAgICAgICAgICAv LyB3aGljaCBnZXRzIGNhbGxlZCBhZnRlciB0aGUgdXNlciBtYWtlcyBhIHNlbGVjdGlvbiBmcm9t Ci0gICAgICAgICAgICAgICAgICAgIC8vIHRoZSBtZW51LgotICAgICAgICAgICAgICAgICAgICBz YXZlTGFzdFNlbGVjdGlvbigpOworICAgICAgICAgICAgUmVuZGVyTWVudUxpc3QqIG1lbnVMaXN0 ID0gdG9SZW5kZXJNZW51TGlzdChyZW5kZXJlcigpKTsKKyAgICAgICAgICAgIGlmIChtZW51TGlz dC0+cG9wdXBJc1Zpc2libGUoKSkKKyAgICAgICAgICAgICAgICBtZW51TGlzdC0+aGlkZVBvcHVw KCk7CisgICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgICAgICAvLyBTYXZlIHRoZSBzZWxl Y3Rpb24gc28gaXQgY2FuIGJlIGNvbXBhcmVkIHRvIHRoZSBuZXcKKyAgICAgICAgICAgICAgICAv LyBzZWxlY3Rpb24gd2hlbiB3ZSBjYWxsIG9uQ2hhbmdlIGR1cmluZyBzZWxlY3RPcHRpb24sCisg ICAgICAgICAgICAgICAgLy8gd2hpY2ggZ2V0cyBjYWxsZWQgZnJvbSBSZW5kZXJNZW51TGlzdDo6 dmFsdWVDaGFuZ2VkLAorICAgICAgICAgICAgICAgIC8vIHdoaWNoIGdldHMgY2FsbGVkIGFmdGVy IHRoZSB1c2VyIG1ha2VzIGEgc2VsZWN0aW9uIGZyb20KKyAgICAgICAgICAgICAgICAvLyB0aGUg bWVudS4KKyAgICAgICAgICAgICAgICBzYXZlTGFzdFNlbGVjdGlvbigpOwogICAgICAgICAgICAg ICAgICAgICBtZW51TGlzdC0+c2hvd1BvcHVwKCk7Ci0gICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgfQogICAgICAgICB9CiAjZW5kaWYKQEAgLTEyODAsMTAgKzEyODAsOSBAQCB2b2lkIEhU TUxTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFCiAKICNpZiAhUExBVEZPUk0oSU9TKQog ICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2ZW50TmFtZXMoKS5ibHVyRXZlbnQgJiYgIWZvY3Vz ZWQoKSkgewotICAgICAgICBpZiAoUmVuZGVyTWVudUxpc3QqIG1lbnVMaXN0ID0gdG9SZW5kZXJN ZW51TGlzdChyZW5kZXJlcigpKSkgewotICAgICAgICAgICAgaWYgKG1lbnVMaXN0LT5wb3B1cElz VmlzaWJsZSgpKQotICAgICAgICAgICAgICAgIG1lbnVMaXN0LT5oaWRlUG9wdXAoKTsKLSAgICAg ICAgfQorICAgICAgICBSZW5kZXJNZW51TGlzdCogbWVudUxpc3QgPSB0b1JlbmRlck1lbnVMaXN0 KHJlbmRlcmVyKCkpOworICAgICAgICBpZiAobWVudUxpc3QtPnBvcHVwSXNWaXNpYmxlKCkpCisg ICAgICAgICAgICBtZW51TGlzdC0+aGlkZVBvcHVwKCk7CiAgICAgfQogI2VuZGlmCiB9CkBAIC0x NTEyLDcgKzE1MTEsNyBAQCB2b2lkIEhUTUxTZWxlY3RFbGVtZW50OjpkZWZhdWx0RXZlbnRIYW5k CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAodXNlc01lbnVMaXN0KCkpCisgICAg aWYgKHJlbmRlcmVyKCktPmlzTWVudUxpc3QoKSkKICAgICAgICAgbWVudUxpc3REZWZhdWx0RXZl bnRIYW5kbGVyKGV2ZW50KTsKICAgICBlbHNlIAogICAgICAgICBsaXN0Qm94RGVmYXVsdEV2ZW50 SGFuZGxlcihldmVudCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVU cmVlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdHlsZS9TdHlsZVJlc29sdmVU cmVlLmNwcAkocmV2aXNpb24gMTYxMTk0KQorKysgU291cmNlL1dlYkNvcmUvc3R5bGUvU3R5bGVS ZXNvbHZlVHJlZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg5MSwxMiArODkxLDUgQEAgdm9pZCBk ZXRhY2hSZW5kZXJUcmVlSW5SZWF0dGFjaE1vZGUoRWxlbQogICAgIGRldGFjaFJlbmRlclRyZWUo ZWxlbWVudCwgUmVhdHRhY2hEZXRhY2gpOwogfQogCi12b2lkIHJlYXR0YWNoUmVuZGVyVHJlZShF bGVtZW50JiBjdXJyZW50KQotewotICAgIGlmIChjdXJyZW50LnJlbmRlcmVyKCkpCi0gICAgICAg IGRldGFjaFJlbmRlclRyZWUoY3VycmVudCwgUmVhdHRhY2hEZXRhY2gpOwotICAgIGF0dGFjaFJl bmRlclRyZWUoY3VycmVudCk7Ci19Ci0KIH0KIH0KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N0eWxl L1N0eWxlUmVzb2x2ZVRyZWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9zdHlsZS9T dHlsZVJlc29sdmVUcmVlLmgJKHJldmlzaW9uIDE2MTE5NCkKKysrIFNvdXJjZS9XZWJDb3JlL3N0 eWxlL1N0eWxlUmVzb2x2ZVRyZWUuaAkod29ya2luZyBjb3B5KQpAQCAtNDMsNyArNDMsNiBAQCB2 b2lkIHJlc29sdmVUcmVlKERvY3VtZW50JiwgQ2hhbmdlKTsKIAogdm9pZCBhdHRhY2hSZW5kZXJU cmVlKEVsZW1lbnQmKTsKIHZvaWQgZGV0YWNoUmVuZGVyVHJlZShFbGVtZW50Jik7Ci12b2lkIHJl YXR0YWNoUmVuZGVyVHJlZShFbGVtZW50Jik7CiAvLyBGSVhNRTogVGhpcyBpcyBvbmx5IHVzZWQg Zm9yICJsYXp5IHJlYXR0YWNoIiBmb3Igc2hhZG93IHRyZWVzLgogdm9pZCBkZXRhY2hSZW5kZXJU cmVlSW5SZWF0dGFjaE1vZGUoRWxlbWVudCYpOwogCg==