137183 2014-09-27 15:13:01 -0700 Use the new is<>() / downcast<>() for Attr Nodes 2014-09-27 21:14:09 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137056 1 cdumez cdumez benjamin cmarcelo commit-queue esprehn+autocc kangil.han kling rniwa oldest_to_newest 1037706 0 cdumez 2014-09-27 15:13:01 -0700 Use the new is<>() / downcast<>() for Attr Nodes instead of isAttr() / toAttr(). 1037707 1 238790 cdumez 2014-09-27 15:16:01 -0700 Created attachment 238790 Patch 1037738 2 238790 commit-queue 2014-09-27 21:14:03 -0700 Comment on attachment 238790 Patch Clearing flags on attachment: 238790 Committed r174038: <http://trac.webkit.org/changeset/174038> 1037739 3 commit-queue 2014-09-27 21:14:09 -0700 All reviewed patches have been landed. Closing bug. 238790 2014-09-27 15:16:01 -0700 2014-09-27 21:14:03 -0700 Patch bug-137183-20140927151601.patch text/plain 9290 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0MDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2NkMjY3YmE3YTQwMjc1 MzFkMjQ3MDEyNzQzNDk4OTMwODk4NWYwMi4uZGFhNmQ5YTg1NDNkNDAwODI1M2IxYzg5Y2YwOWE2 ODgzN2JlZjFiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTA5LTI3ICBDaHJp c3RvcGhlIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgdGhlIG5ldyBp czw+KCkgLyBkb3duY2FzdDw+KCkgZm9yIEF0dHIgTm9kZXMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzE4MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgbmV3IGlzPD4oKSAvIGRvd25jYXN0 PD4oKSBmb3IgQXR0ciBOb2RlcyBpbnN0ZWFkIG9mIGlzQXR0cigpIC8KKyAgICAgICAgdG9BdHRy KCkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBubyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAg ICAgKiBkb20vQXR0ci5oOgorICAgICAgICAoV2ViQ29yZTo6aXNBdHRyKToKKyAgICAgICAgKiBk b20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmltcG9ydE5vZGUp OgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmFkb3B0Tm9kZSk6CisgICAgICAgICogZG9t L05hbWVkTm9kZU1hcC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOYW1lZE5vZGVNYXA6OnNldE5h bWVkSXRlbSk6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9k ZTo6Y29tcGFyZURvY3VtZW50UG9zaXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JET01BZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JET01BZ2VudDo6YnVp bGRPYmplY3RGb3JOb2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTm9kZUZpbmRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JOb2RlRmluZGVyOjpzZWFyY2hVc2lu Z1hQYXRoKToKKyAgICAgICAgKiB4bWwvWFBhdGhOb2RlU2V0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OlhQYXRoOjpzb3J0QmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6WFBhdGg6Ok5vZGVTZXQ6 OnNvcnQpOgorICAgICAgICAoV2ViQ29yZTo6WFBhdGg6OmZpbmRSb290Tm9kZSk6CisKIDIwMTQt MDktMjcgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAgICAgICAg Q2hhaW5pbmcgbXVsdGlwbGUgOm50aC1jaGlsZCgpIGRvZXMgbm90IHdvcmsgcHJvcGVybHkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9BdHRyLmggYi9Tb3VyY2UvV2ViQ29yZS9kb20v QXR0ci5oCmluZGV4IDNlMzRjY2E2NjZjZTAwYzUyYzVlYjU1ZmQ1NzY0ZWFhYjZhMmFjMjYuLjFm NmJjZTQzMTBiZmU0MzU1MDc3YzlhZWYzNDljNDYyOTEwYjU4MzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9BdHRyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0F0dHIuaApAQCAt OTksMTAgKzk5LDkgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX2lnbm9yZUNoaWxkcmVuQ2hh bmdlZDsKIH07CiAKLWlubGluZSBib29sIGlzQXR0cihjb25zdCBOb2RlJiBub2RlKSB7IHJldHVy biBub2RlLmlzQXR0cmlidXRlTm9kZSgpOyB9Ci12b2lkIGlzQXR0cihjb25zdCBBdHRyJik7IC8v IENhdGNoIHVubmVjZXNzYXJ5IHJ1bnRpbWUgY2hlY2sgb2YgdHlwZSBrbm93biBhdCBjb21waWxl IHRpbWUuCi0KLU5PREVfVFlQRV9DQVNUUyhBdHRyKQorU1BFQ0lBTElaRV9UWVBFX1RSQUlUU19C RUdJTihBdHRyKQorICAgIHN0YXRpYyBib29sIGlzQXR0cihjb25zdCBOb2RlJiBub2RlKSB7IHJl dHVybiBub2RlLmlzQXR0cmlidXRlTm9kZSgpOyB9CitTUEVDSUFMSVpFX1RZUEVfVFJBSVRTX0VO RCgpCiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5k ZXggZjUwOTMyOWUyZDkzZGNlNTQwNGEzOTUxZWI3MjU5OGRlOGRhZTA4Ny4uNWE5MDBmMDRjYjJk MDc1ZTNjM2RiYzRkNTQzZjFiOTFiYzJkNWVhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBA IC05NjYsNyArOTY2LDcgQEAgUGFzc1JlZlB0cjxOb2RlPiBEb2N1bWVudDo6aW1wb3J0Tm9kZShO b2RlKiBpbXBvcnRlZE5vZGUsIGJvb2wgZGVlcCwgRXhjZXB0aW9uQ28KICAgICAgICAgcmV0dXJu IG5ld0VsZW1lbnQucmVsZWFzZSgpOwogICAgIH0KICAgICBjYXNlIEFUVFJJQlVURV9OT0RFOgot ICAgICAgICByZXR1cm4gQXR0cjo6Y3JlYXRlKCp0aGlzLCBRdWFsaWZpZWROYW1lKG51bGxBdG9t LCB0b0F0dHIoKmltcG9ydGVkTm9kZSkubmFtZSgpLCBudWxsQXRvbSksIHRvQXR0cigqaW1wb3J0 ZWROb2RlKS52YWx1ZSgpKTsKKyAgICAgICAgcmV0dXJuIEF0dHI6OmNyZWF0ZSgqdGhpcywgUXVh bGlmaWVkTmFtZShudWxsQXRvbSwgZG93bmNhc3Q8QXR0cj4oKmltcG9ydGVkTm9kZSkubmFtZSgp LCBudWxsQXRvbSksIGRvd25jYXN0PEF0dHI+KCppbXBvcnRlZE5vZGUpLnZhbHVlKCkpOwogICAg IGNhc2UgRE9DVU1FTlRfRlJBR01FTlRfTk9ERTogewogICAgICAgICBpZiAoaW1wb3J0ZWROb2Rl LT5pc1NoYWRvd1Jvb3QoKSkgewogICAgICAgICAgICAgLy8gU2hhZG93Um9vdCBub2RlcyBzaG91 bGQgbm90IGJlIGV4cGxpY2l0bHkgaW1wb3J0YWJsZS4KQEAgLTEwMjUsNyArMTAyNSw3IEBAIFBh c3NSZWZQdHI8Tm9kZT4gRG9jdW1lbnQ6OmFkb3B0Tm9kZShQYXNzUmVmUHRyPE5vZGU+IHNvdXJj ZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiAgICAgICAgIGVjID0gTk9UX1NVUFBPUlRFRF9FUlI7CiAg ICAgICAgIHJldHVybiBudWxscHRyOwogICAgIGNhc2UgQVRUUklCVVRFX05PREU6IHsgICAgICAg ICAgICAgICAgICAgCi0gICAgICAgIEF0dHImIGF0dHIgPSB0b0F0dHIoKnNvdXJjZSk7CisgICAg ICAgIEF0dHImIGF0dHIgPSBkb3duY2FzdDxBdHRyPigqc291cmNlKTsKICAgICAgICAgaWYgKGF0 dHIub3duZXJFbGVtZW50KCkpCiAgICAgICAgICAgICBhdHRyLm93bmVyRWxlbWVudCgpLT5yZW1v dmVBdHRyaWJ1dGVOb2RlKCZhdHRyLCBlYyk7CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL05hbWVkTm9kZU1hcC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v TmFtZWROb2RlTWFwLmNwcAppbmRleCAxYjhkZjBmODIzZGEyMWFkYjc1NDdiNWJkMzkyMWEzNmM2 MzhjODAzLi5hYWVhMGJhNjIxYWYzZmYyYzM4YzI0M2U3NjhlNTk1NzQ3NTYzMWYzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTmFtZWROb2RlTWFwLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vTmFtZWROb2RlTWFwLmNwcApAQCAtODIsMTYgKzgyLDE2IEBAIFBhc3NSZWZQdHI8 Tm9kZT4gTmFtZWROb2RlTWFwOjpzZXROYW1lZEl0ZW0oTm9kZSogbm9kZSwgRXhjZXB0aW9uQ29k ZSYgZWMpCiB7CiAgICAgaWYgKCFub2RlKSB7CiAgICAgICAgIGVjID0gTk9UX0ZPVU5EX0VSUjsK LSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAogICAg IC8vIE5vdCBtZW50aW9uZWQgaW4gc3BlYzogdGhyb3cgYSBISUVSQVJDSFlfUkVRVUVTVF9FUlJP UiBpZiB0aGUgdXNlciBwYXNzZXMgaW4gYSBub24tYXR0cmlidXRlIG5vZGUKLSAgICBpZiAoIW5v ZGUtPmlzQXR0cmlidXRlTm9kZSgpKSB7CisgICAgaWYgKCFpczxBdHRyPihub2RlKSkgewogICAg ICAgICBlYyA9IEhJRVJBUkNIWV9SRVFVRVNUX0VSUjsKLSAgICAgICAgcmV0dXJuIDA7CisgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAgIHJldHVybiBtX2VsZW1lbnQuc2V0QXR0 cmlidXRlTm9kZSh0b0F0dHIobm9kZSksIGVjKTsKKyAgICByZXR1cm4gbV9lbGVtZW50LnNldEF0 dHJpYnV0ZU5vZGUoZG93bmNhc3Q8QXR0cj4obm9kZSksIGVjKTsKIH0KIAogUGFzc1JlZlB0cjxO b2RlPiBOYW1lZE5vZGVNYXA6OnNldE5hbWVkSXRlbU5TKE5vZGUqIG5vZGUsIEV4Y2VwdGlvbkNv ZGUmIGVjKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IGY2ZDYwNWMzODE3ODBiMDg3YzA3ZWQyNGU4N2Mx MjQxYWI1MDliMmIuLjA0NWIzNGQwMzAzNzQzNWJhYTFiMDVkOTQ0N2MwOGU2ZjFmOTljYTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9kb20vTm9kZS5jcHAKQEAgLTEzOTcsMTUgKzEzOTcsMTUgQEAgYm9vbCBOb2RlOjpvZmZzZXRJ bkNoYXJhY3RlcnMoKSBjb25zdAogCiB1bnNpZ25lZCBzaG9ydCBOb2RlOjpjb21wYXJlRG9jdW1l bnRQb3NpdGlvbihOb2RlKiBvdGhlck5vZGUpCiB7Ci0gICAgLy8gSXQgaXMgbm90IGNsZWFyIHdo YXQgc2hvdWxkIGJlIGRvbmUgaWYgfG90aGVyTm9kZXwgaXMgMC4KKyAgICAvLyBJdCBpcyBub3Qg Y2xlYXIgd2hhdCBzaG91bGQgYmUgZG9uZSBpZiB8b3RoZXJOb2RlfCBpcyBudWxscHRyLgogICAg IGlmICghb3RoZXJOb2RlKQogICAgICAgICByZXR1cm4gRE9DVU1FTlRfUE9TSVRJT05fRElTQ09O TkVDVEVEOwogCiAgICAgaWYgKG90aGVyTm9kZSA9PSB0aGlzKQogICAgICAgICByZXR1cm4gRE9D VU1FTlRfUE9TSVRJT05fRVFVSVZBTEVOVDsKICAgICAKLSAgICBBdHRyKiBhdHRyMSA9IGlzQXR0 cmlidXRlTm9kZSgpID8gdG9BdHRyKHRoaXMpIDogbnVsbHB0cjsKLSAgICBBdHRyKiBhdHRyMiA9 IG90aGVyTm9kZS0+aXNBdHRyaWJ1dGVOb2RlKCkgPyB0b0F0dHIob3RoZXJOb2RlKSA6IG51bGxw dHI7CisgICAgQXR0ciogYXR0cjEgPSBpczxBdHRyPih0aGlzKSA/IGRvd25jYXN0PEF0dHI+KHRo aXMpIDogbnVsbHB0cjsKKyAgICBBdHRyKiBhdHRyMiA9IGlzPEF0dHI+KG90aGVyTm9kZSkgPyBk b3duY2FzdDxBdHRyPihvdGhlck5vZGUpIDogbnVsbHB0cjsKICAgICAKICAgICBOb2RlKiBzdGFy dDEgPSBhdHRyMSA/IGF0dHIxLT5vd25lckVsZW1lbnQoKSA6IHRoaXM7CiAgICAgTm9kZSogc3Rh cnQyID0gYXR0cjIgPyBhdHRyMi0+b3duZXJFbGVtZW50KCkgOiBvdGhlck5vZGU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NQWdlbnQuY3BwIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTUFnZW50LmNwcAppbmRleCAzYTNkZTMw YjNlZGQ3ODU1OTYxMjRkYzE4YjczYjIxYTcwODEzMWI4Li43NjFkZTU0NWMxNjc4YmRkNmEwYWZl ZDI1YWE4YzhlNDQyYTUwODZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRE9NQWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JET01BZ2VudC5jcHAKQEAgLTEzMTEsMTAgKzEzMTEsMTAgQEAgUGFzc1JlZlB0cjxJbnNw ZWN0b3I6OlByb3RvY29sOjpET006Ok5vZGU+IEluc3BlY3RvckRPTUFnZW50OjpidWlsZE9iamVj dEZvck5vZGUKICAgICAgICAgdmFsdWUtPnNldFB1YmxpY0lkKGRvY1R5cGUtPnB1YmxpY0lkKCkp OwogICAgICAgICB2YWx1ZS0+c2V0U3lzdGVtSWQoZG9jVHlwZS0+c3lzdGVtSWQoKSk7CiAgICAg ICAgIHZhbHVlLT5zZXRJbnRlcm5hbFN1YnNldChkb2NUeXBlLT5pbnRlcm5hbFN1YnNldCgpKTsK LSAgICB9IGVsc2UgaWYgKG5vZGUtPmlzQXR0cmlidXRlTm9kZSgpKSB7Ci0gICAgICAgIEF0dHIq IGF0dHJpYnV0ZSA9IHRvQXR0cihub2RlKTsKLSAgICAgICAgdmFsdWUtPnNldE5hbWUoYXR0cmli dXRlLT5uYW1lKCkpOwotICAgICAgICB2YWx1ZS0+c2V0VmFsdWUoYXR0cmlidXRlLT52YWx1ZSgp KTsKKyAgICB9IGVsc2UgaWYgKGlzPEF0dHI+KG5vZGUpKSB7CisgICAgICAgIEF0dHImIGF0dHJp YnV0ZSA9IGRvd25jYXN0PEF0dHI+KCpub2RlKTsKKyAgICAgICAgdmFsdWUtPnNldE5hbWUoYXR0 cmlidXRlLm5hbWUoKSk7CisgICAgICAgIHZhbHVlLT5zZXRWYWx1ZShhdHRyaWJ1dGUudmFsdWUo KSk7CiAgICAgfQogCiAgICAgLy8gTmVlZCB0byBlbmFibGUgQVggdG8gZ2V0IHRoZSBjb21wdXRl ZCByb2xlLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck5v ZGVGaW5kZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck5vZGVGaW5k ZXIuY3BwCmluZGV4IDg3YzBhOGYzNDczMDU4YjBiZDEzZWY2OGNkZGI0ZDAzYmI1NGRiMjcuLjQ5 NGRhZTIwZDZhYTljODc3N2FiYWExMWZjYjU2NzAxNGI3ODliNzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JOb2RlRmluZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTm9kZUZpbmRlci5jcHAKQEAgLTE0Niw4ICsxNDYs OCBAQCB2b2lkIEluc3BlY3Rvck5vZGVGaW5kZXI6OnNlYXJjaFVzaW5nWFBhdGgoTm9kZSogcGFy ZW50Tm9kZSkKICAgICAgICAgaWYgKGVjKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAg IGlmIChub2RlLT5pc0F0dHJpYnV0ZU5vZGUoKSkKLSAgICAgICAgICAgIG5vZGUgPSB0b0F0dHIo bm9kZSktPm93bmVyRWxlbWVudCgpOworICAgICAgICBpZiAoaXM8QXR0cj4obm9kZSkpCisgICAg ICAgICAgICBub2RlID0gZG93bmNhc3Q8QXR0cj4oKm5vZGUpLm93bmVyRWxlbWVudCgpOwogCiAg ICAgICAgIC8vIFhQYXRoIGNhbiBnZXQgb3V0IG9mIHRoZSBjb250ZXh0IG5vZGUgdGhhdCB3ZSBw YXNzIGFzIHRoZSBzdGFydGluZyBwb2ludCB0byBldmFsdWF0ZSwgc28gd2UgbmVlZCB0byBmaWx0 ZXIgZm9yIGp1c3QgdGhlIG5vZGVzIHdlIGNhcmUgYWJvdXQuCiAgICAgICAgIGlmIChub2RlID09 IHBhcmVudE5vZGUgfHwgbm9kZS0+aXNEZXNjZW5kYW50T2YocGFyZW50Tm9kZSkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWFBhdGhOb2RlU2V0LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3htbC9YUGF0aE5vZGVTZXQuY3BwCmluZGV4IDBkMjY0M2JhOTIyMjQ4ZWFkMDRmYjQwNGY2NDI1 MWQ3NzFmMWQ5ZjYuLjBmZDQxMGMzMzMyYzY0MmIxNjNmZjBlMmM3NzA3ZjkxMWYzNGYxYzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9YUGF0aE5vZGVTZXQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3htbC9YUGF0aE5vZGVTZXQuY3BwCkBAIC05NCw4ICs5NCw4IEBAIHN0YXRpYyB2 b2lkIHNvcnRCbG9jayh1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgVmVjdG9yPFZlY3RvcjxO b2RlKj4+JiBwYXJlbnRNCiAgICAgICAgIHVuc2lnbmVkIHNvcnRlZEVuZCA9IGZyb207CiAgICAg ICAgIC8vIEZJWE1FOiBuYW1lc3BhY2Ugbm9kZXMgYXJlIG5vdCBpbXBsZW1lbnRlZC4KICAgICAg ICAgZm9yICh1bnNpZ25lZCBpID0gc29ydGVkRW5kOyBpIDwgdG87ICsraSkgewotICAgICAgICAg ICAgTm9kZSogbiA9IHBhcmVudE1hdHJpeFtpXVswXTsKLSAgICAgICAgICAgIGlmIChuLT5pc0F0 dHJpYnV0ZU5vZGUoKSAmJiB0b0F0dHIobiktPm93bmVyRWxlbWVudCgpID09IGNvbW1vbkFuY2Vz dG9yKQorICAgICAgICAgICAgTm9kZSogbm9kZSA9IHBhcmVudE1hdHJpeFtpXVswXTsKKyAgICAg ICAgICAgIGlmIChpczxBdHRyPihub2RlKSAmJiBkb3duY2FzdDxBdHRyPigqbm9kZSkub3duZXJF bGVtZW50KCkgPT0gY29tbW9uQW5jZXN0b3IpCiAgICAgICAgICAgICAgICAgcGFyZW50TWF0cml4 W2ldLnN3YXAocGFyZW50TWF0cml4W3NvcnRlZEVuZCsrXSk7CiAgICAgICAgIH0KICAgICAgICAg aWYgKHNvcnRlZEVuZCAhPSBmcm9tKSB7CkBAIC0xNTUsMTUgKzE1NSwxNSBAQCB2b2lkIE5vZGVT ZXQ6OnNvcnQoKSBjb25zdAogICAgIFZlY3RvcjxWZWN0b3I8Tm9kZSo+PiBwYXJlbnRNYXRyaXgo bm9kZUNvdW50KTsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbm9kZUNvdW50OyArK2kp IHsKICAgICAgICAgVmVjdG9yPE5vZGUqPiYgcGFyZW50c1ZlY3RvciA9IHBhcmVudE1hdHJpeFtp XTsKLSAgICAgICAgTm9kZSogbiA9IG1fbm9kZXNbaV0uZ2V0KCk7Ci0gICAgICAgIHBhcmVudHNW ZWN0b3IuYXBwZW5kKG4pOwotICAgICAgICBpZiAobi0+aXNBdHRyaWJ1dGVOb2RlKCkpIHsKLSAg ICAgICAgICAgIG4gPSB0b0F0dHIobiktPm93bmVyRWxlbWVudCgpOwotICAgICAgICAgICAgcGFy ZW50c1ZlY3Rvci5hcHBlbmQobik7CisgICAgICAgIE5vZGUqIG5vZGUgPSBtX25vZGVzW2ldLmdl dCgpOworICAgICAgICBwYXJlbnRzVmVjdG9yLmFwcGVuZChub2RlKTsKKyAgICAgICAgaWYgKGlz PEF0dHI+KG5vZGUpKSB7CisgICAgICAgICAgICBub2RlID0gZG93bmNhc3Q8QXR0cj4oKm5vZGUp Lm93bmVyRWxlbWVudCgpOworICAgICAgICAgICAgcGFyZW50c1ZlY3Rvci5hcHBlbmQobm9kZSk7 CiAgICAgICAgICAgICBjb250YWluc0F0dHJpYnV0ZU5vZGVzID0gdHJ1ZTsKICAgICAgICAgfQot ICAgICAgICB3aGlsZSAoKG4gPSBuLT5wYXJlbnROb2RlKCkpKQotICAgICAgICAgICAgcGFyZW50 c1ZlY3Rvci5hcHBlbmQobik7CisgICAgICAgIHdoaWxlICgobm9kZSA9IG5vZGUtPnBhcmVudE5v ZGUoKSkpCisgICAgICAgICAgICBwYXJlbnRzVmVjdG9yLmFwcGVuZChub2RlKTsKICAgICB9CiAg ICAgc29ydEJsb2NrKDAsIG5vZGVDb3VudCwgcGFyZW50TWF0cml4LCBjb250YWluc0F0dHJpYnV0 ZU5vZGVzKTsKICAgICAKQEAgLTE3OSw4ICsxNzksOCBAQCB2b2lkIE5vZGVTZXQ6OnNvcnQoKSBj b25zdAogCiBzdGF0aWMgTm9kZSogZmluZFJvb3ROb2RlKE5vZGUqIG5vZGUpCiB7Ci0gICAgaWYg KG5vZGUtPmlzQXR0cmlidXRlTm9kZSgpKQotICAgICAgICBub2RlID0gdG9BdHRyKG5vZGUpLT5v d25lckVsZW1lbnQoKTsKKyAgICBpZiAoaXM8QXR0cj4obm9kZSkpCisgICAgICAgIG5vZGUgPSBk b3duY2FzdDxBdHRyPigqbm9kZSkub3duZXJFbGVtZW50KCk7CiAgICAgaWYgKG5vZGUtPmluRG9j dW1lbnQoKSkKICAgICAgICAgbm9kZSA9ICZub2RlLT5kb2N1bWVudCgpOwogICAgIGVsc2Ugewo=