195987 2019-03-19 21:44:41 -0700 [CSS OM] StyledElementInlineStylePropertyMap creates a Ref cycle with its owner element 2019-03-20 14:23:05 -0700 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa rniwa ddkilzer dino graouts koivisto simon.fraser zalan oldest_to_newest 1518751 0 rniwa 2019-03-19 21:44:41 -0700 There is a very obvious leak here. StyledElementInlineStylePropertyMap ref's its element and Element Ref's the map in ElementRareData. <rdar://problem/47254121> 1518762 1 365308 rniwa 2019-03-19 22:14:43 -0700 Created attachment 365308 Fixes the bug 1518763 2 365309 rniwa 2019-03-19 22:18:32 -0700 Created attachment 365309 Updated the change log 1519113 3 365309 simon.fraser 2019-03-20 13:01:45 -0700 Comment on attachment 365309 Updated the change log View in context: https://bugs.webkit.org/attachment.cgi?id=365309&action=review > Source/WebCore/dom/Element.cpp:209 > + if (auto* map = elementRareData()->attributeStyleMap()) > + map->clearElement(); Maybe ElementRareData should have a clearElement or clearNdoe function on it 1519115 4 rniwa 2019-03-20 13:14:00 -0700 (In reply to Simon Fraser (smfr) from comment #3) > Comment on attachment 365309 [details] > Updated the change log > > View in context: > https://bugs.webkit.org/attachment.cgi?id=365309&action=review > > > Source/WebCore/dom/Element.cpp:209 > > + if (auto* map = elementRareData()->attributeStyleMap()) > > + map->clearElement(); > > Maybe ElementRareData should have a clearElement or clearNdoe function on it That approach makes sense as well. Although I'm hoping that I can just add the support for WeakPtr<Element> and remove this code. 1519174 5 rniwa 2019-03-20 14:23:05 -0700 Committed r243239: <https://trac.webkit.org/changeset/243239> 365308 2019-03-19 22:14:43 -0700 2019-03-19 22:18:31 -0700 Fixes the bug bug-195987-20190319221442.patch text/plain 6926 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MzE5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTAzLTE5ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgT01dIFN0eWxlZEVsZW1l bnRJbmxpbmVTdHlsZVByb3BlcnR5TWFwIGNyZWF0ZXMgYSBSZWYgY3ljbGUgd2l0aCBpdHMgb3du ZXIgZWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk1OTg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGVzdDogY3NzLXR5cGVkb20vYXR0cmlidXRlLXN0eWxlLW1hcC1zaG91bGQtbm90LWxlYWst ZXZlcnktZWxlbWVudC5odG1sCisKKyAgICAgICAgKiBjc3MvdHlwZWRvbS9TdHlsZVByb3BlcnR5 TWFwLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVByb3BlcnR5TWFwKTogQWRkZWQgY2xlYXJF bGVtZW50IGFzIGEgdmlydHVhbCBmdW5jdGlvbi4KKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojp+RWxlbWVudCk6IENsZWFyIHRoZSBlbGVtZW50 IHBvaW50ZXIgaW4gU3R5bGVkRWxlbWVudElubGluZVN0eWxlUHJvcGVydHlNYXAuCisgICAgICAg ICogZG9tL1N0eWxlZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkRWxlbWVu dElubGluZVN0eWxlUHJvcGVydHlNYXA6OmdldCk6IEFkZGVkIGEgbnVsbCBjaGVjayBmb3IgbV9l bGVtZW50LgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkRWxlbWVudElubGluZVN0eWxlUHJvcGVy dHlNYXA6OlN0eWxlZEVsZW1lbnRJbmxpbmVTdHlsZVByb3BlcnR5TWFwKToKKyAgICAgICAgKFdl YkNvcmU6OlN0eWxlZEVsZW1lbnRJbmxpbmVTdHlsZVByb3BlcnR5TWFwOjpjbGVhckVsZW1lbnQp OiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlZEVsZW1lbnRJbmxpbmVTdHlsZVByb3Bl cnR5TWFwKTogVXNlIGEgcmF3IHBvaW50ZXIgaW5zdGVhZCBvZiBSZWYgdG8gU3R5bGVkRWxlbWVu dAorICAgICAgICB0byBhdm9pZCB0aGUgbGVhay4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9DdXN0b21QYWludEltYWdlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhhc2hNYXBTdHlsZVBy b3BlcnR5TWFwOjpjbGVhckVsZW1lbnQpOiBBZGRlZC4KKwogMjAxOS0wMy0xOCAgTWFjaWVqIFN0 YWNob3dpYWsgIDxtanNAYXBwbGUuY29tPgogCiAgICAgICAgIFNpbXBsaWZ5IENvY29hIHBsYXRm b3JtIHVzZXIgYWdlbnQgbG9naWMgYnkgdXNpbmcgc3RyaW5nIGNvbnN0YW50cyBpbnN0ZWFkIG9m IGZ1bmN0aW9uIGNhbGxzIGZvciB0aGUgZnJvemVuIHBhcnRzCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9jc3MvdHlwZWRvbS9TdHlsZVByb3BlcnR5TWFwLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvY3NzL3R5cGVkb20vU3R5bGVQcm9wZXJ0eU1hcC5oCShyZXZpc2lvbiAyNDMxOTApCisr KyBTb3VyY2UvV2ViQ29yZS9jc3MvdHlwZWRvbS9TdHlsZVByb3BlcnR5TWFwLmgJKHdvcmtpbmcg Y29weSkKQEAgLTM0LDcgKzM0LDExIEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3Mg RWxlbWVudDsKKwogY2xhc3MgU3R5bGVQcm9wZXJ0eU1hcCA6IHB1YmxpYyBTdHlsZVByb3BlcnR5 TWFwUmVhZE9ubHkgeworcHVibGljOgorICAgIHZpcnR1YWwgdm9pZCBjbGVhckVsZW1lbnQoKSA9 IDA7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9k b20vRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwCShyZXZpc2lvbiAyNDMxOTApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTIwMyw2ICsyMDMsMTMgQEAgRWxlbWVudDo6fkVsZW1lbnQoKQog ICAgIGlmIChoYXNTeW50aGV0aWNBdHRyQ2hpbGROb2RlcygpKQogICAgICAgICBkZXRhY2hBbGxB dHRyTm9kZXNGcm9tRWxlbWVudCgpOwogCisjaWYgRU5BQkxFKENTU19UWVBFRF9PTSkKKyAgICBp ZiAoaGFzUmFyZURhdGEoKSkgeworICAgICAgICBpZiAoYXV0byogbWFwID0gZWxlbWVudFJhcmVE YXRhKCktPmF0dHJpYnV0ZVN0eWxlTWFwKCkpCisgICAgICAgICAgICBtYXAtPmNsZWFyRWxlbWVu dCgpOworICAgIH0KKyNlbmRpZgorCiAgICAgaWYgKGhhc1BlbmRpbmdSZXNvdXJjZXMoKSkgewog ICAgICAgICBkb2N1bWVudCgpLmFjY2Vzc1NWR0V4dGVuc2lvbnMoKS5yZW1vdmVFbGVtZW50RnJv bVBlbmRpbmdSZXNvdXJjZXMoKnRoaXMpOwogICAgICAgICBBU1NFUlQoIWhhc1BlbmRpbmdSZXNv dXJjZXMoKSk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVudC5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL1N0eWxlZEVsZW1lbnQuY3BwCShyZXZpc2lv biAyNDMxOTApCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vU3R5bGVkRWxlbWVudC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTg4LDE0ICs4OCwxOSBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIFJlZlB0 cjxUeXBlZE9NQ1NTU3R5bGVWYWx1ZT4gZ2V0KGNvbnN0IFN0cmluZyYgcHJvcGVydHkpIGNvbnN0 IGZpbmFsCiAgICAgewotICAgICAgICByZXR1cm4gZXh0cmFjdElubGluZVByb3BlcnR5KHByb3Bl cnR5LCBtX2VsZW1lbnQuZ2V0KCkpOworICAgICAgICBBU1NFUlQobV9lbGVtZW50KTsgLy8gSGl0 dGluZyB0aGlzIGFzc2VydGlvbiB3b3VsZCBpbXBseSBhIEdDIGJ1Zy4gRWxlbWVudCBpcyBjb2xs ZWN0ZWQgd2hpbGUgdGhpcyBwcm9wZXJ0eSBtYXAgaXMgYWxpdmUuCisgICAgICAgIGlmICghbV9l bGVtZW50KQorICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAgICAgIHJldHVybiBleHRy YWN0SW5saW5lUHJvcGVydHkocHJvcGVydHksICptX2VsZW1lbnQpOwogICAgIH0KIAogICAgIGV4 cGxpY2l0IFN0eWxlZEVsZW1lbnRJbmxpbmVTdHlsZVByb3BlcnR5TWFwKFN0eWxlZEVsZW1lbnQm IGVsZW1lbnQpCi0gICAgICAgIDogbV9lbGVtZW50KG1ha2VSZWYoZWxlbWVudCkpCisgICAgICAg IDogbV9lbGVtZW50KCZlbGVtZW50KQogICAgIHsKICAgICB9CiAKKyAgICB2b2lkIGNsZWFyRWxl bWVudCgpIG92ZXJyaWRlIHsgbV9lbGVtZW50ID0gbnVsbHB0cjsgfQorCiAgICAgc3RhdGljIFJl ZlB0cjxUeXBlZE9NQ1NTU3R5bGVWYWx1ZT4gZXh0cmFjdElubGluZVByb3BlcnR5KGNvbnN0IFN0 cmluZyYgbmFtZSwgU3R5bGVkRWxlbWVudCYgZWxlbWVudCkKICAgICB7CiAgICAgICAgIGlmICgh ZWxlbWVudC5pbmxpbmVTdHlsZSgpKQpAQCAtMTE0LDcgKzExOSw3IEBAIHByaXZhdGU6CiAgICAg ICAgIHJldHVybiBTdHlsZVByb3BlcnR5TWFwUmVhZE9ubHk6OnJlaWZ5VmFsdWUodmFsdWUuZ2V0 KCksIGVsZW1lbnQuZG9jdW1lbnQoKSwgJmVsZW1lbnQpOwogICAgIH0KIAotICAgIFJlZjxTdHls ZWRFbGVtZW50PiBtX2VsZW1lbnQ7CisgICAgU3R5bGVkRWxlbWVudCogbV9lbGVtZW50IHsgbnVs bHB0ciB9OwogfTsKIAogU3R5bGVQcm9wZXJ0eU1hcCYgU3R5bGVkRWxlbWVudDo6ZW5zdXJlQXR0 cmlidXRlU3R5bGVNYXAoKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Q3VzdG9tUGFpbnRJbWFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvQ3VzdG9tUGFpbnRJbWFnZS5jcHAJKHJldmlzaW9uIDI0MzE5MCkKKysrIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0N1c3RvbVBhaW50SW1hZ2UuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC0xMDUsNiArMTA1LDggQEAgcHJpdmF0ZToKICAgICB7CiAgICAgfQogCisg ICAgdm9pZCBjbGVhckVsZW1lbnQoKSBvdmVycmlkZSB7IH0KKwogICAgIFJlZlB0cjxUeXBlZE9N Q1NTU3R5bGVWYWx1ZT4gZ2V0KGNvbnN0IFN0cmluZyYgcHJvcGVydHkpIGNvbnN0IGZpbmFsIHsg cmV0dXJuIG1ha2VSZWZQdHIobV9tYXAuZ2V0KHByb3BlcnR5KSk7IH0KIAogICAgIEhhc2hNYXA8 U3RyaW5nLCBSZWZQdHI8VHlwZWRPTUNTU1N0eWxlVmFsdWU+PiBtX21hcDsKSW5kZXg6IExheW91 dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0MzE5MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE1IEBACisyMDE5LTAzLTE5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQu b3JnPgorCisgICAgICAgIFtDU1MgT01dIFN0eWxlZEVsZW1lbnRJbmxpbmVTdHlsZVByb3BlcnR5 TWFwIGNyZWF0ZXMgYSBSZWYgY3ljbGUgd2l0aCBpdHMgb3duZXIgZWxlbWVudAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk1OTg3CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYSByZWdyZXNzaW9u IHRlc3QuCisKKyAgICAgICAgKiBjc3MtdHlwZWRvbS9hdHRyaWJ1dGUtc3R5bGUtbWFwLXNob3Vs ZC1ub3QtbGVhay1ldmVyeS1lbGVtZW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog Y3NzLXR5cGVkb20vYXR0cmlidXRlLXN0eWxlLW1hcC1zaG91bGQtbm90LWxlYWstZXZlcnktZWxl bWVudC5odG1sOiBBZGRlZC4KKwogMjAxOS0wMy0xOSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBSZWJhc2VsaW5lIHRoZSB0ZXN0IGFmdGVyIHIyNDMxNzUuIEl0 IGdvdCBzb21laG93IGxhbmRlZCB3aXRoIGZhaWxpbmcgZXhwZWN0YXRpb25zLgpJbmRleDogTGF5 b3V0VGVzdHMvY3NzLXR5cGVkb20vYXR0cmlidXRlLXN0eWxlLW1hcC1zaG91bGQtbm90LWxlYWst ZXZlcnktZWxlbWVudC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvY3Nz LXR5cGVkb20vYXR0cmlidXRlLXN0eWxlLW1hcC1zaG91bGQtbm90LWxlYWstZXZlcnktZWxlbWVu dC1leHBlY3RlZC50eHQJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvY3NzLXR5cGVkb20v YXR0cmlidXRlLXN0eWxlLW1hcC1zaG91bGQtbm90LWxlYWstZXZlcnktZWxlbWVudC1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwzIEBACitUaGlzIHRlc3RzIGFsbG9jYXRp bmcgMTAwMCBlbGVtZW50cyBhbmQgdHJpZ2dlcmluZyBHQy4gR0Mgc2hvdWxkIGNvbGxlY3Qgc29t ZSBlbGVtZW50cy4KKworUEFTUwpJbmRleDogTGF5b3V0VGVzdHMvY3NzLXR5cGVkb20vYXR0cmli dXRlLXN0eWxlLW1hcC1zaG91bGQtbm90LWxlYWstZXZlcnktZWxlbWVudC5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL2Nzcy10eXBlZG9tL2F0dHJpYnV0ZS1zdHlsZS1tYXAtc2hvdWxk LW5vdC1sZWFrLWV2ZXJ5LWVsZW1lbnQuaHRtbAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRUZXN0 cy9jc3MtdHlwZWRvbS9hdHRyaWJ1dGUtc3R5bGUtbWFwLXNob3VsZC1ub3QtbGVhay1ldmVyeS1l bGVtZW50Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyOSBAQAorPCFET0NUWVBFIGh0 bWw+Cis8aHRtbD4KKzxib2R5PgorPHA+VGhpcyB0ZXN0cyBhbGxvY2F0aW5nIDEwMDAgZWxlbWVu dHMgYW5kIHRyaWdnZXJpbmcgR0MuIEdDIHNob3VsZCBjb2xsZWN0IHNvbWUgZWxlbWVudHMuPC9w PgorPHNjcmlwdD4KKworaWYgKCF3aW5kb3cuaW50ZXJuYWxzKQorICAgIGRvY3VtZW50LndyaXRl KCdUaGlzIHRlc3QgcmVxdWlyZXMgaW50ZXJuYWxzJyk7CitlbHNlIHsKKyAgICB0ZXN0UnVubmVy LmR1bXBBc1RleHQoKTsKKworICAgIGNvbnN0IGluaXRpYWxOb2RlQ291bnQgPSBpbnRlcm5hbHMu bnVtYmVyT2ZMaXZlTm9kZXMoKTsKKworICAgIGNvbnN0IHRlc3RDb3VudCA9IDEwMDA7CisgICAg KCgpID0+IHsKKyAgICAgICAgZm9yIChsZXQgaSA9IDA7IGkgPCB0ZXN0Q291bnQ7ICsraSkKKyAg ICAgICAgICAgIGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2RpdicpLmF0dHJpYnV0ZVN0eWxlTWFw OworICAgIH0pKCk7CisKKyAgICBpZiAod2luZG93LkdDQ29udHJvbGxlcikKKyAgICAgICAgR0ND b250cm9sbGVyLmNvbGxlY3QoKTsKKworICAgIGNvbnN0IG5vZGVDb3VudERpZmYgPSBpbnRlcm5h bHMubnVtYmVyT2ZMaXZlTm9kZXMoKSAtIGluaXRpYWxOb2RlQ291bnQ7CisgICAgZG9jdW1lbnQu d3JpdGUobm9kZUNvdW50RGlmZiA8IHRlc3RDb3VudCAvIDEuNSA/ICdQQVNTJyA6IGBGQUlMIC0g JHtub2RlQ291bnREaWZmfSBub2RlcyBhbGl2ZSBhZnRlciB0cmlnZ2VyaW5nIEdDYCk7Cit9CisK Kzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgo= 365309 2019-03-19 22:18:32 -0700 2019-03-20 13:01:45 -0700 Updated the change log bug-195987-20190319221832.patch text/plain 7414 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI0MzE5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMyIEBACisyMDE5LTAzLTE5ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFtDU1MgT01dIFN0eWxlZEVsZW1l bnRJbmxpbmVTdHlsZVByb3BlcnR5TWFwIGNyZWF0ZXMgYSBSZWYgY3ljbGUgd2l0aCBpdHMgb3du ZXIgZWxlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTk1OTg3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU3R5bGVkRWxlbWVudElubGluZVN0eWxlUHJvcGVydHlNYXAgd2FzIGxlYWtpbmcgZXZlcnkg ZWxlbWVudCBmb3Igd2hpY2ggaXQgd2FzIGNyZWF0ZWQgYmVjYXVzZSBkdWUgdG8KKyAgICAgICAg YSByZWZlcmVuY2UgY3ljbGUuIFRoZSBTdHlsZWRFbGVtZW50SW5saW5lU3R5bGVQcm9wZXJ0eU1h cCBob2xkcyBvbnRvIGl0cyBlbGVtZW50IHVzaW5nIFJlZiBhbmQKKyAgICAgICAgdGhlIGVsZW1l bnQgYWxzbyBzdG9yZXMgU3R5bGVkRWxlbWVudElubGluZVN0eWxlUHJvcGVydHlNYXAgaW4gRWxl bWVudFJhcmVEYXRhIHVzaW5nIFJlZlB0ci4KKworICAgICAgICBGaXhlZCB0aGUgY3ljbGUgYnkg bWFraW5nIHRoZSByZWZlcmVuY2UgZnJvbSBTdHlsZWRFbGVtZW50SW5saW5lU3R5bGVQcm9wZXJ0 eU1hcCB3ZWFrLiBGb3Igbm93IHdlIHVzZQorICAgICAgICBhIHJhdyBwb2ludGVyIGJlY2F1c2Ug d2UgY2FuJ3QgY3JlYXRlIGEgV2Vha1B0ciBvZiBhbiBlbGVtZW50IHlldC4KKworICAgICAgICBU ZXN0OiBjc3MtdHlwZWRvbS9hdHRyaWJ1dGUtc3R5bGUtbWFwLXNob3VsZC1ub3QtbGVhay1ldmVy eS1lbGVtZW50Lmh0bWwKKworICAgICAgICAqIGNzcy90eXBlZG9tL1N0eWxlUHJvcGVydHlNYXAu aDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUHJvcGVydHlNYXApOiBBZGRlZCBjbGVhckVsZW1l bnQgYXMgYSB2aXJ0dWFsIGZ1bmN0aW9uLgorICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6On5FbGVtZW50KTogQ2xlYXIgdGhlIGVsZW1lbnQgcG9p bnRlciBpbiBTdHlsZWRFbGVtZW50SW5saW5lU3R5bGVQcm9wZXJ0eU1hcC4KKyAgICAgICAgKiBk b20vU3R5bGVkRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRFbGVtZW50SW5s aW5lU3R5bGVQcm9wZXJ0eU1hcDo6Z2V0KTogQWRkZWQgYSBudWxsIGNoZWNrIGZvciBtX2VsZW1l bnQuCisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRFbGVtZW50SW5saW5lU3R5bGVQcm9wZXJ0eU1h cDo6U3R5bGVkRWxlbWVudElubGluZVN0eWxlUHJvcGVydHlNYXApOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVkRWxlbWVudElubGluZVN0eWxlUHJvcGVydHlNYXA6OmNsZWFyRWxlbWVudCk6IEFk ZGVkLgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVkRWxlbWVudElubGluZVN0eWxlUHJvcGVydHlN YXApOiBVc2UgYSByYXcgcG9pbnRlciBpbnN0ZWFkIG9mIFJlZiB0byBTdHlsZWRFbGVtZW50Cisg ICAgICAgIHRvIGF2b2lkIHRoZSBsZWFrLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0N1 c3RvbVBhaW50SW1hZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGFzaE1hcFN0eWxlUHJvcGVy dHlNYXA6OmNsZWFyRWxlbWVudCk6IEFkZGVkLgorCiAyMDE5LTAzLTE4ICBNYWNpZWogU3RhY2hv d2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgQ29jb2EgcGxhdGZvcm0g dXNlciBhZ2VudCBsb2dpYyBieSB1c2luZyBzdHJpbmcgY29uc3RhbnRzIGluc3RlYWQgb2YgZnVu Y3Rpb24gY2FsbHMgZm9yIHRoZSBmcm96ZW4gcGFydHMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nz cy90eXBlZG9tL1N0eWxlUHJvcGVydHlNYXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9jc3MvdHlwZWRvbS9TdHlsZVByb3BlcnR5TWFwLmgJKHJldmlzaW9uIDI0MzE5MCkKKysrIFNv dXJjZS9XZWJDb3JlL2Nzcy90eXBlZG9tL1N0eWxlUHJvcGVydHlNYXAuaAkod29ya2luZyBjb3B5 KQpAQCAtMzUsNiArMzUsOCBAQAogbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBTdHlsZVBy b3BlcnR5TWFwIDogcHVibGljIFN0eWxlUHJvcGVydHlNYXBSZWFkT25seSB7CitwdWJsaWM6Cisg ICAgdmlydHVhbCB2b2lkIGNsZWFyRWxlbWVudCgpID0gMDsKIH07CiAKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHJldmlzaW9uIDI0MzE5MCkKKysr IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjAzLDYg KzIwMywxMyBAQCBFbGVtZW50Ojp+RWxlbWVudCgpCiAgICAgaWYgKGhhc1N5bnRoZXRpY0F0dHJD aGlsZE5vZGVzKCkpCiAgICAgICAgIGRldGFjaEFsbEF0dHJOb2Rlc0Zyb21FbGVtZW50KCk7CiAK KyNpZiBFTkFCTEUoQ1NTX1RZUEVEX09NKQorICAgIGlmIChoYXNSYXJlRGF0YSgpKSB7CisgICAg ICAgIGlmIChhdXRvKiBtYXAgPSBlbGVtZW50UmFyZURhdGEoKS0+YXR0cmlidXRlU3R5bGVNYXAo KSkKKyAgICAgICAgICAgIG1hcC0+Y2xlYXJFbGVtZW50KCk7CisgICAgfQorI2VuZGlmCisKICAg ICBpZiAoaGFzUGVuZGluZ1Jlc291cmNlcygpKSB7CiAgICAgICAgIGRvY3VtZW50KCkuYWNjZXNz U1ZHRXh0ZW5zaW9ucygpLnJlbW92ZUVsZW1lbnRGcm9tUGVuZGluZ1Jlc291cmNlcygqdGhpcyk7 CiAgICAgICAgIEFTU0VSVCghaGFzUGVuZGluZ1Jlc291cmNlcygpKTsKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9kb20vU3R5bGVkRWxlbWVudC5jcHAJKHJldmlzaW9uIDI0MzE5MCkKKysrIFNvdXJjZS9XZWJD b3JlL2RvbS9TdHlsZWRFbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODgsMTQgKzg4LDE5 IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgUmVmUHRyPFR5cGVkT01DU1NTdHlsZVZhbHVlPiBn ZXQoY29uc3QgU3RyaW5nJiBwcm9wZXJ0eSkgY29uc3QgZmluYWwKICAgICB7Ci0gICAgICAgIHJl dHVybiBleHRyYWN0SW5saW5lUHJvcGVydHkocHJvcGVydHksIG1fZWxlbWVudC5nZXQoKSk7Cisg ICAgICAgIEFTU0VSVChtX2VsZW1lbnQpOyAvLyBIaXR0aW5nIHRoaXMgYXNzZXJ0aW9uIHdvdWxk IGltcGx5IGEgR0MgYnVnLiBFbGVtZW50IGlzIGNvbGxlY3RlZCB3aGlsZSB0aGlzIHByb3BlcnR5 IG1hcCBpcyBhbGl2ZS4KKyAgICAgICAgaWYgKCFtX2VsZW1lbnQpCisgICAgICAgICAgICByZXR1 cm4gbnVsbHB0cjsKKyAgICAgICAgcmV0dXJuIGV4dHJhY3RJbmxpbmVQcm9wZXJ0eShwcm9wZXJ0 eSwgKm1fZWxlbWVudCk7CiAgICAgfQogCiAgICAgZXhwbGljaXQgU3R5bGVkRWxlbWVudElubGlu ZVN0eWxlUHJvcGVydHlNYXAoU3R5bGVkRWxlbWVudCYgZWxlbWVudCkKLSAgICAgICAgOiBtX2Vs ZW1lbnQobWFrZVJlZihlbGVtZW50KSkKKyAgICAgICAgOiBtX2VsZW1lbnQoJmVsZW1lbnQpCiAg ICAgewogICAgIH0KIAorICAgIHZvaWQgY2xlYXJFbGVtZW50KCkgb3ZlcnJpZGUgeyBtX2VsZW1l bnQgPSBudWxscHRyOyB9CisKICAgICBzdGF0aWMgUmVmUHRyPFR5cGVkT01DU1NTdHlsZVZhbHVl PiBleHRyYWN0SW5saW5lUHJvcGVydHkoY29uc3QgU3RyaW5nJiBuYW1lLCBTdHlsZWRFbGVtZW50 JiBlbGVtZW50KQogICAgIHsKICAgICAgICAgaWYgKCFlbGVtZW50LmlubGluZVN0eWxlKCkpCkBA IC0xMTQsNyArMTE5LDcgQEAgcHJpdmF0ZToKICAgICAgICAgcmV0dXJuIFN0eWxlUHJvcGVydHlN YXBSZWFkT25seTo6cmVpZnlWYWx1ZSh2YWx1ZS5nZXQoKSwgZWxlbWVudC5kb2N1bWVudCgpLCAm ZWxlbWVudCk7CiAgICAgfQogCi0gICAgUmVmPFN0eWxlZEVsZW1lbnQ+IG1fZWxlbWVudDsKKyAg ICBTdHlsZWRFbGVtZW50KiBtX2VsZW1lbnQgeyBudWxscHRyIH07CiB9OwogCiBTdHlsZVByb3Bl cnR5TWFwJiBTdHlsZWRFbGVtZW50OjplbnN1cmVBdHRyaWJ1dGVTdHlsZU1hcCgpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9DdXN0b21QYWludEltYWdlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9DdXN0b21QYWludElt YWdlLmNwcAkocmV2aXNpb24gMjQzMTkwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvQ3VzdG9tUGFpbnRJbWFnZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw2ICsxMDUs OCBAQCBwcml2YXRlOgogICAgIHsKICAgICB9CiAKKyAgICB2b2lkIGNsZWFyRWxlbWVudCgpIG92 ZXJyaWRlIHsgfQorCiAgICAgUmVmUHRyPFR5cGVkT01DU1NTdHlsZVZhbHVlPiBnZXQoY29uc3Qg U3RyaW5nJiBwcm9wZXJ0eSkgY29uc3QgZmluYWwgeyByZXR1cm4gbWFrZVJlZlB0cihtX21hcC5n ZXQocHJvcGVydHkpKTsgfQogCiAgICAgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxUeXBlZE9NQ1NT U3R5bGVWYWx1ZT4+IG1fbWFwOwpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gMjQzMTkwKQorKysgTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDMt MTkgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBPTV0g U3R5bGVkRWxlbWVudElubGluZVN0eWxlUHJvcGVydHlNYXAgY3JlYXRlcyBhIFJlZiBjeWNsZSB3 aXRoIGl0cyBvd25lciBlbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTU5ODcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGRlZCBhIHJlZ3Jlc3Npb24gdGVzdC4KKworICAgICAgICAqIGNzcy10 eXBlZG9tL2F0dHJpYnV0ZS1zdHlsZS1tYXAtc2hvdWxkLW5vdC1sZWFrLWV2ZXJ5LWVsZW1lbnQt ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBjc3MtdHlwZWRvbS9hdHRyaWJ1dGUtc3R5 bGUtbWFwLXNob3VsZC1ub3QtbGVhay1ldmVyeS1lbGVtZW50Lmh0bWw6IEFkZGVkLgorCiAyMDE5 LTAzLTE5ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlYmFz ZWxpbmUgdGhlIHRlc3QgYWZ0ZXIgcjI0MzE3NS4gSXQgZ290IHNvbWVob3cgbGFuZGVkIHdpdGgg ZmFpbGluZyBleHBlY3RhdGlvbnMuCkluZGV4OiBMYXlvdXRUZXN0cy9jc3MtdHlwZWRvbS9hdHRy aWJ1dGUtc3R5bGUtbWFwLXNob3VsZC1ub3QtbGVhay1ldmVyeS1lbGVtZW50LWV4cGVjdGVkLnR4 dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9jc3MtdHlwZWRvbS9hdHRyaWJ1dGUtc3R5bGUt bWFwLXNob3VsZC1ub3QtbGVhay1ldmVyeS1lbGVtZW50LWV4cGVjdGVkLnR4dAkobm9uZXhpc3Rl bnQpCisrKyBMYXlvdXRUZXN0cy9jc3MtdHlwZWRvbS9hdHRyaWJ1dGUtc3R5bGUtbWFwLXNob3Vs ZC1ub3QtbGVhay1ldmVyeS1lbGVtZW50LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAt MCwwICsxLDMgQEAKK1RoaXMgdGVzdHMgYWxsb2NhdGluZyAxMDAwIGVsZW1lbnRzIGFuZCB0cmln Z2VyaW5nIEdDLiBHQyBzaG91bGQgY29sbGVjdCBzb21lIGVsZW1lbnRzLgorCitQQVNTCkluZGV4 OiBMYXlvdXRUZXN0cy9jc3MtdHlwZWRvbS9hdHRyaWJ1dGUtc3R5bGUtbWFwLXNob3VsZC1ub3Qt bGVhay1ldmVyeS1lbGVtZW50Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvY3NzLXR5 cGVkb20vYXR0cmlidXRlLXN0eWxlLW1hcC1zaG91bGQtbm90LWxlYWstZXZlcnktZWxlbWVudC5o dG1sCShub25leGlzdGVudCkKKysrIExheW91dFRlc3RzL2Nzcy10eXBlZG9tL2F0dHJpYnV0ZS1z dHlsZS1tYXAtc2hvdWxkLW5vdC1sZWFrLWV2ZXJ5LWVsZW1lbnQuaHRtbAkod29ya2luZyBjb3B5 KQpAQCAtMCwwICsxLDI5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGJvZHk+Cis8cD5U aGlzIHRlc3RzIGFsbG9jYXRpbmcgMTAwMCBlbGVtZW50cyBhbmQgdHJpZ2dlcmluZyBHQy4gR0Mg c2hvdWxkIGNvbGxlY3Qgc29tZSBlbGVtZW50cy48L3A+Cis8c2NyaXB0PgorCitpZiAoIXdpbmRv dy5pbnRlcm5hbHMpCisgICAgZG9jdW1lbnQud3JpdGUoJ1RoaXMgdGVzdCByZXF1aXJlcyBpbnRl cm5hbHMnKTsKK2Vsc2UgeworICAgIHRlc3RSdW5uZXIuZHVtcEFzVGV4dCgpOworCisgICAgY29u c3QgaW5pdGlhbE5vZGVDb3VudCA9IGludGVybmFscy5udW1iZXJPZkxpdmVOb2RlcygpOworCisg ICAgY29uc3QgdGVzdENvdW50ID0gMTAwMDsKKyAgICAoKCkgPT4geworICAgICAgICBmb3IgKGxl dCBpID0gMDsgaSA8IHRlc3RDb3VudDsgKytpKQorICAgICAgICAgICAgZG9jdW1lbnQuY3JlYXRl RWxlbWVudCgnZGl2JykuYXR0cmlidXRlU3R5bGVNYXA7CisgICAgfSkoKTsKKworICAgIGlmICh3 aW5kb3cuR0NDb250cm9sbGVyKQorICAgICAgICBHQ0NvbnRyb2xsZXIuY29sbGVjdCgpOworCisg ICAgY29uc3Qgbm9kZUNvdW50RGlmZiA9IGludGVybmFscy5udW1iZXJPZkxpdmVOb2RlcygpIC0g aW5pdGlhbE5vZGVDb3VudDsKKyAgICBkb2N1bWVudC53cml0ZShub2RlQ291bnREaWZmIDwgdGVz dENvdW50IC8gMS41ID8gJ1BBU1MnIDogYEZBSUwgLSAke25vZGVDb3VudERpZmZ9IG5vZGVzIGFs aXZlIGFmdGVyIHRyaWdnZXJpbmcgR0NgKTsKK30KKworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0 bWw+Cg==