92329 2012-07-25 19:07:38 -0700 XML parser should use parserSetAttributes instead of setAttributeNS 2019-02-06 09:02:41 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 92310 P2 Normal --- 1 rniwa rniwa abarth cdumez cmarcelo eric oldest_to_newest 678745 0 rniwa 2012-07-25 19:07:38 -0700 It's not safe to use setAttributeNS because it fires a bunch of events. Of course, the element had not been inserted in to the document at the point so we're not firing events. Nonetheless, it's very error prone. 678760 1 154525 rniwa 2012-07-25 19:16:43 -0700 Created attachment 154525 Refactoring 678771 2 154525 rniwa 2012-07-25 19:23:33 -0700 Comment on attachment 154525 Refactoring View in context: https://bugs.webkit.org/attachment.cgi?id=154525&action=review > Source/WebCore/ChangeLog:12 > + There should be no user observable behavior change. Actually, I lied. This will fix the bug 92310... merging the bugs. 678772 3 rniwa 2012-07-25 19:23:47 -0700 *** This bug has been marked as a duplicate of bug 92310 *** 1502822 4 lforschler 2019-02-06 09:02:41 -0800 Mass moving XML DOM bugs to the "DOM" Component. 154525 2012-07-25 19:16:43 -0700 2012-07-25 19:23:32 -0700 Refactoring bug-92329-20120725191633.patch text/plain 10824 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyMzY5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTA3LTI1ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIFhNTCBwYXJzZXIgc2hvdWxkIHVz ZSBwYXJzZXJTZXRBdHRyaWJ1dGVzIGluc3RlYWQgb2Ygc2V0QXR0cmlidXRlTlMKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkyMzI5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ2FsbCBwYXJzZXJTZXRBdHRy aWJ1dGVzIGluIFhNTCBwYXJzZXJzLiBBZnRlciB0aGlzIHBhdGNoLCBoYW5kbGVOYW1lc3BhY2VB dHRyaWJ1dGVzCisgICAgICAgIGFuZCBoYW5kbGVFbGVtZW50QXR0cmlidXRlcyBzaW1wbHkgZmls bHMgdXAgYSBWZWN0b3Igd2l0aCB3aGljaCBzdGFydEVsZW1lbnROcworICAgICAgICAob3IgcGFy c2VTdGFydEVsZW1lbnQgaW4gUXQpIGNhbGxzIHBhcnNlclNldEF0dHJpYnV0ZXMuCisKKyAgICAg ICAgVGhlcmUgc2hvdWxkIGJlIG5vIHVzZXIgb2JzZXJ2YWJsZSBiZWhhdmlvciBjaGFuZ2UuCisK KyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50Ojpz ZXRBdHRyaWJ1dGVOUyk6IE5vIGxvbmdlciB0YWtlcyBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Np b24uCisgICAgICAgICogZG9tL0VsZW1lbnQuaDoKKyAgICAgICAgKEVsZW1lbnQpOgorICAgICAg ICAqIHhtbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OmhhbmRsZU5hbWVzcGFjZUF0dHJpYnV0ZXMpOiBSZW5hbWVkIGZyb20gaGFuZGxlRWxl bWVudE5hbWVzcGFjZXMuCisgICAgICAgIENhbGwgcGFyc2VyU2V0QXR0cmlidXRlcyBldmVuIHdo ZW4gZXhpdGluZyBlYXJseSB0byBiZSBtYWludGFpbiB0aGUgc2FtZSBiZWhhdmlvci4KKyAgICAg ICAgKFdlYkNvcmU6OmhhbmRsZUVsZW1lbnRBdHRyaWJ1dGVzKToKKyAgICAgICAgKFdlYkNvcmU6 OlhNTERvY3VtZW50UGFyc2VyOjpzdGFydEVsZW1lbnROcyk6CisgICAgICAgICogeG1sL3BhcnNl ci9YTUxEb2N1bWVudFBhcnNlclF0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmhhbmRsZU5hbWVz cGFjZUF0dHJpYnV0ZXMpOiBVc2UgWE1MTlNOYW1lczo6eG1sbnNOYW1lc3BhY2VVUkkuCisgICAg ICAgIENhbGwgcGFyc2VyU2V0QXR0cmlidXRlcyBldmVuIHdoZW4gZXhpdGluZyBlYXJseSB0byBi ZSBtYWludGFpbiB0aGUgc2FtZSBiZWhhdmlvci4KKyAgICAgICAgKFdlYkNvcmU6OmhhbmRsZUVs ZW1lbnRBdHRyaWJ1dGVzKToKKyAgICAgICAgKFdlYkNvcmU6OlhNTERvY3VtZW50UGFyc2VyOjpw YXJzZVN0YXJ0RWxlbWVudCk6CisKIDIwMTItMDctMjUgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjEyMTQyMCk6IFBlcmZvcm1hbmNlIHJl Z3Jlc3Npb24gb2YgZm9ybSBzdGF0ZSBzYXZpbmcgZm9yIHBhZ2VzIHdpdGggbXVsdGlwbGUgZm9y bXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAJKHJldmlzaW9uIDEyMzY4MikKKysrIFNvdXJj ZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ2Miw3ICsxNDYy LDcgQEAgUGFzc1JlZlB0cjxBdHRyPiBFbGVtZW50OjpyZW1vdmVBdHRyaWJ1dAogICAgIHJldHVy biBkZXRhY2hBdHRyaWJ1dGUoaW5kZXgpOwogfQogCi12b2lkIEVsZW1lbnQ6OnNldEF0dHJpYnV0 ZU5TKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZXNwYWNlVVJJLCBjb25zdCBBdG9taWNTdHJpbmcm IHF1YWxpZmllZE5hbWUsIGNvbnN0IEF0b21pY1N0cmluZyYgdmFsdWUsIEV4Y2VwdGlvbkNvZGUm IGVjLCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24gc2NyaXB0aW5nUGVybWlzc2lvbikKK3Zv aWQgRWxlbWVudDo6c2V0QXR0cmlidXRlTlMoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1lc3BhY2VV UkksIGNvbnN0IEF0b21pY1N0cmluZyYgcXVhbGlmaWVkTmFtZSwgY29uc3QgQXRvbWljU3RyaW5n JiB2YWx1ZSwgRXhjZXB0aW9uQ29kZSYgZWMpCiB7CiAgICAgU3RyaW5nIHByZWZpeCwgbG9jYWxO YW1lOwogICAgIGlmICghRG9jdW1lbnQ6OnBhcnNlUXVhbGlmaWVkTmFtZShxdWFsaWZpZWROYW1l LCBwcmVmaXgsIGxvY2FsTmFtZSwgZWMpKQpAQCAtMTQ3NSw5ICsxNDc1LDYgQEAgdm9pZCBFbGVt ZW50OjpzZXRBdHRyaWJ1dGVOUyhjb25zdCBBdG9taQogICAgICAgICByZXR1cm47CiAgICAgfQog Ci0gICAgaWYgKHNjcmlwdGluZ1Blcm1pc3Npb24gPT0gRGlzYWxsb3dTY3JpcHRpbmdDb250ZW50 ICYmIChpc0V2ZW50SGFuZGxlckF0dHJpYnV0ZShxTmFtZSkgfHwgaXNBdHRyaWJ1dGVUb1JlbW92 ZShxTmFtZSwgdmFsdWUpKSkKLSAgICAgICAgcmV0dXJuOwotCiAgICAgc2V0QXR0cmlidXRlKHFO YW1lLCB2YWx1ZSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAkocmV2aXNpb24gMTIzNjgy KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtMTQ2 LDcgKzE0Niw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBBdG9taWNTdHJpbmcmIGdldEF0dHJpYnV0 ZU5TKGNvbnN0IFN0cmluZyYgbmFtZXNwYWNlVVJJLCBjb25zdCBTdHJpbmcmIGxvY2FsTmFtZSkg Y29uc3Q7CiAKICAgICB2b2lkIHNldEF0dHJpYnV0ZShjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUs IGNvbnN0IEF0b21pY1N0cmluZyYgdmFsdWUsIEV4Y2VwdGlvbkNvZGUmKTsKLSAgICB2b2lkIHNl dEF0dHJpYnV0ZU5TKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZXNwYWNlVVJJLCBjb25zdCBBdG9t aWNTdHJpbmcmIHF1YWxpZmllZE5hbWUsIGNvbnN0IEF0b21pY1N0cmluZyYgdmFsdWUsIEV4Y2Vw dGlvbkNvZGUmLCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24gPSBBbGxvd1NjcmlwdGluZ0Nv bnRlbnQpOworICAgIHZvaWQgc2V0QXR0cmlidXRlTlMoY29uc3QgQXRvbWljU3RyaW5nJiBuYW1l c3BhY2VVUkksIGNvbnN0IEF0b21pY1N0cmluZyYgcXVhbGlmaWVkTmFtZSwgY29uc3QgQXRvbWlj U3RyaW5nJiB2YWx1ZSwgRXhjZXB0aW9uQ29kZSYpOwogCiAgICAgYm9vbCBpc0lkQXR0cmlidXRl TmFtZShjb25zdCBRdWFsaWZpZWROYW1lJikgY29uc3Q7CiAgICAgY29uc3QgQXRvbWljU3RyaW5n JiBnZXRJZEF0dHJpYnV0ZSgpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYkNvcmUveG1sL3BhcnNl ci9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3htbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJMaWJ4bWwyLmNwcAkocmV2aXNpb24gMTIz NjgyKQorKysgU291cmNlL1dlYkNvcmUveG1sL3BhcnNlci9YTUxEb2N1bWVudFBhcnNlckxpYnht bDIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02OTYsNyArNjk2LDcgQEAgc3RydWN0IF94bWxTQVgy TmFtZXNwYWNlIHsKIH07CiB0eXBlZGVmIHN0cnVjdCBfeG1sU0FYMk5hbWVzcGFjZSB4bWxTQVgy TmFtZXNwYWNlOwogCi1zdGF0aWMgaW5saW5lIHZvaWQgaGFuZGxlRWxlbWVudE5hbWVzcGFjZXMo RWxlbWVudCogbmV3RWxlbWVudCwgY29uc3QgeG1sQ2hhcioqIGxpYnhtbE5hbWVzcGFjZXMsIGlu dCBuYl9uYW1lc3BhY2VzLCBFeGNlcHRpb25Db2RlJiBlYywgRnJhZ21lbnRTY3JpcHRpbmdQZXJt aXNzaW9uIHNjcmlwdGluZ1Blcm1pc3Npb24pCitzdGF0aWMgaW5saW5lIHZvaWQgaGFuZGxlTmFt ZXNwYWNlQXR0cmlidXRlcyhWZWN0b3I8QXR0cmlidXRlLCA4PiYgcHJlZml4ZWRBdHRyaWJ1dGVz LCBjb25zdCB4bWxDaGFyKiogbGlieG1sTmFtZXNwYWNlcywgaW50IG5iX25hbWVzcGFjZXMsIEV4 Y2VwdGlvbkNvZGUmIGVjKQogewogICAgIHhtbFNBWDJOYW1lc3BhY2UqIG5hbWVzcGFjZXMgPSBy ZWludGVycHJldF9jYXN0PHhtbFNBWDJOYW1lc3BhY2UqPihsaWJ4bWxOYW1lc3BhY2VzKTsKICAg ICBmb3IgKGludCBpID0gMDsgaSA8IG5iX25hbWVzcGFjZXM7IGkrKykgewpAQCAtNzA0LDkgKzcw NCwxMiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgaGFuZGxlRWxlbWVudE5hbWVzcGFjCiAgICAgICAg IEF0b21pY1N0cmluZyBuYW1lc3BhY2VVUkkgPSB0b0F0b21pY1N0cmluZyhuYW1lc3BhY2VzW2ld LnVyaSk7CiAgICAgICAgIGlmIChuYW1lc3BhY2VzW2ldLnByZWZpeCkKICAgICAgICAgICAgIG5h bWVzcGFjZVFOYW1lID0gInhtbG5zOiIgKyB0b1N0cmluZyhuYW1lc3BhY2VzW2ldLnByZWZpeCk7 Ci0gICAgICAgIG5ld0VsZW1lbnQtPnNldEF0dHJpYnV0ZU5TKFhNTE5TTmFtZXM6OnhtbG5zTmFt ZXNwYWNlVVJJLCBuYW1lc3BhY2VRTmFtZSwgbmFtZXNwYWNlVVJJLCBlYywgc2NyaXB0aW5nUGVy bWlzc2lvbik7Ci0gICAgICAgIGlmIChlYykgLy8gZXhjZXB0aW9uIHNldHRpbmcgYXR0cmlidXRl cworCisgICAgICAgIFN0cmluZyBwcmVmaXgsIGxvY2FsTmFtZTsKKyAgICAgICAgaWYgKCFEb2N1 bWVudDo6cGFyc2VRdWFsaWZpZWROYW1lKG5hbWVzcGFjZVFOYW1lLCBwcmVmaXgsIGxvY2FsTmFt ZSwgZWMpKQogICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHByZWZpeGVkQXR0cmlidXRl cy5hcHBlbmQoQXR0cmlidXRlKFF1YWxpZmllZE5hbWUocHJlZml4LCBsb2NhbE5hbWUsIFhNTE5T TmFtZXM6OnhtbG5zTmFtZXNwYWNlVVJJKSwgbmFtZXNwYWNlVVJJKSk7CiAgICAgfQogfQogCkBA IC03MTksNyArNzIyLDcgQEAgc3RydWN0IF94bWxTQVgyQXR0cmlidXRlcyB7CiB9OwogdHlwZWRl ZiBzdHJ1Y3QgX3htbFNBWDJBdHRyaWJ1dGVzIHhtbFNBWDJBdHRyaWJ1dGVzOwogCi1zdGF0aWMg aW5saW5lIHZvaWQgaGFuZGxlRWxlbWVudEF0dHJpYnV0ZXMoRWxlbWVudCogbmV3RWxlbWVudCwg Y29uc3QgeG1sQ2hhcioqIGxpYnhtbEF0dHJpYnV0ZXMsIGludCBuYl9hdHRyaWJ1dGVzLCBFeGNl cHRpb25Db2RlJiBlYywgRnJhZ21lbnRTY3JpcHRpbmdQZXJtaXNzaW9uIHNjcmlwdGluZ1Blcm1p c3Npb24pCitzdGF0aWMgaW5saW5lIHZvaWQgaGFuZGxlRWxlbWVudEF0dHJpYnV0ZXMoVmVjdG9y PEF0dHJpYnV0ZSwgOD4mIHByZWZpeGVkQXR0cmlidXRlcywgY29uc3QgeG1sQ2hhcioqIGxpYnht bEF0dHJpYnV0ZXMsIGludCBuYl9hdHRyaWJ1dGVzLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAg ICB4bWxTQVgyQXR0cmlidXRlcyogYXR0cmlidXRlcyA9IHJlaW50ZXJwcmV0X2Nhc3Q8eG1sU0FY MkF0dHJpYnV0ZXMqPihsaWJ4bWxBdHRyaWJ1dGVzKTsKICAgICBmb3IgKGludCBpID0gMDsgaSA8 IG5iX2F0dHJpYnV0ZXM7IGkrKykgewpAQCAtNzI5LDkgKzczMiwxMSBAQCBzdGF0aWMgaW5saW5l IHZvaWQgaGFuZGxlRWxlbWVudEF0dHJpYnV0CiAgICAgICAgIEF0b21pY1N0cmluZyBhdHRyVVJJ ID0gYXR0clByZWZpeC5pc0VtcHR5KCkgPyBBdG9taWNTdHJpbmcoKSA6IHRvQXRvbWljU3RyaW5n KGF0dHJpYnV0ZXNbaV0udXJpKTsKICAgICAgICAgQXRvbWljU3RyaW5nIGF0dHJRTmFtZSA9IGF0 dHJQcmVmaXguaXNFbXB0eSgpID8gdG9BdG9taWNTdHJpbmcoYXR0cmlidXRlc1tpXS5sb2NhbG5h bWUpIDogYXR0clByZWZpeCArICI6IiArIHRvU3RyaW5nKGF0dHJpYnV0ZXNbaV0ubG9jYWxuYW1l KTsKIAotICAgICAgICBuZXdFbGVtZW50LT5zZXRBdHRyaWJ1dGVOUyhhdHRyVVJJLCBhdHRyUU5h bWUsIGF0dHJWYWx1ZSwgZWMsIHNjcmlwdGluZ1Blcm1pc3Npb24pOwotICAgICAgICBpZiAoZWMp IC8vIGV4Y2VwdGlvbiBzZXR0aW5nIGF0dHJpYnV0ZXMKKyAgICAgICAgU3RyaW5nIHByZWZpeCwg bG9jYWxOYW1lOworICAgICAgICBpZiAoIURvY3VtZW50OjpwYXJzZVF1YWxpZmllZE5hbWUoYXR0 clFOYW1lLCBwcmVmaXgsIGxvY2FsTmFtZSwgZWMpKQogICAgICAgICAgICAgcmV0dXJuOworCisg ICAgICAgIHByZWZpeGVkQXR0cmlidXRlcy5hcHBlbmQoQXR0cmlidXRlKFF1YWxpZmllZE5hbWUo cHJlZml4LCBsb2NhbE5hbWUsIGF0dHJVUkkpLCBhdHRyVmFsdWUpKTsKICAgICB9CiB9CiAKQEAg LTc4OCwxNCArNzkzLDE3IEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OnN0YXJ0RWxlbWVudE5z KGMKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIFZlY3RvcjxBdHRyaWJ1dGUsIDg+IHBy ZWZpeGVkQXR0cmlidXRlczsKICAgICBFeGNlcHRpb25Db2RlIGVjID0gMDsKLSAgICBoYW5kbGVF bGVtZW50TmFtZXNwYWNlcyhuZXdFbGVtZW50LmdldCgpLCBsaWJ4bWxOYW1lc3BhY2VzLCBuYl9u YW1lc3BhY2VzLCBlYywgbV9zY3JpcHRpbmdQZXJtaXNzaW9uKTsKKyAgICBoYW5kbGVOYW1lc3Bh Y2VBdHRyaWJ1dGVzKHByZWZpeGVkQXR0cmlidXRlcywgbGlieG1sTmFtZXNwYWNlcywgbmJfbmFt ZXNwYWNlcywgZWMpOwogICAgIGlmIChlYykgeworICAgICAgICBuZXdFbGVtZW50LT5wYXJzZXJT ZXRBdHRyaWJ1dGVzKHByZWZpeGVkQXR0cmlidXRlcywgbV9zY3JpcHRpbmdQZXJtaXNzaW9uKTsK ICAgICAgICAgc3RvcFBhcnNpbmcoKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGhh bmRsZUVsZW1lbnRBdHRyaWJ1dGVzKG5ld0VsZW1lbnQuZ2V0KCksIGxpYnhtbEF0dHJpYnV0ZXMs IG5iX2F0dHJpYnV0ZXMsIGVjLCBtX3NjcmlwdGluZ1Blcm1pc3Npb24pOworICAgIGhhbmRsZUVs ZW1lbnRBdHRyaWJ1dGVzKHByZWZpeGVkQXR0cmlidXRlcywgbGlieG1sQXR0cmlidXRlcywgbmJf YXR0cmlidXRlcywgZWMpOworICAgIG5ld0VsZW1lbnQtPnBhcnNlclNldEF0dHJpYnV0ZXMocHJl Zml4ZWRBdHRyaWJ1dGVzLCBtX3NjcmlwdGluZ1Blcm1pc3Npb24pOwogICAgIGlmIChlYykgewog ICAgICAgICBzdG9wUGFyc2luZygpOwogICAgICAgICByZXR1cm47CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS94bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyUXQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3htbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJRdC5jcHAJKHJldmlzaW9u IDEyMzY4MikKKysrIFNvdXJjZS9XZWJDb3JlL3htbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJR dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMxNSwyMiArMzE1LDIzIEBAIHN0YXRpYyBpbmxpbmUg U3RyaW5nIHByZWZpeEZyb21RTmFtZShjb24KICAgICAgICAgcmV0dXJuIHFOYW1lLmxlZnQob2Zm c2V0KTsKIH0KIAotc3RhdGljIGlubGluZSB2b2lkIGhhbmRsZUVsZW1lbnROYW1lc3BhY2VzKEVs ZW1lbnQqIG5ld0VsZW1lbnQsIGNvbnN0IFFYbWxTdHJlYW1OYW1lc3BhY2VEZWNsYXJhdGlvbnMg Jm5zLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEV4Y2VwdGlv bkNvZGUmIGVjLCBGcmFnbWVudFNjcmlwdGluZ1Blcm1pc3Npb24gc2NyaXB0aW5nUGVybWlzc2lv bikKK3N0YXRpYyBpbmxpbmUgdm9pZCBoYW5kbGVOYW1lc3BhY2VBdHRyaWJ1dGVzKFZlY3RvcjxB dHRyaWJ1dGUsIDg+JiBwcmVmaXhlZEF0dHJpYnV0ZXMsIGNvbnN0IFFYbWxTdHJlYW1OYW1lc3Bh Y2VEZWNsYXJhdGlvbnMgJm5zLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKICAgICBmb3IgKGludCBp ID0gMDsgaSA8IG5zLmNvdW50KCk7ICsraSkgewogICAgICAgICBjb25zdCBRWG1sU3RyZWFtTmFt ZXNwYWNlRGVjbGFyYXRpb24gJmRlY2wgPSBuc1tpXTsKICAgICAgICAgU3RyaW5nIG5hbWVzcGFj ZVVSSSA9IGRlY2wubmFtZXNwYWNlVXJpKCk7CiAgICAgICAgIFN0cmluZyBuYW1lc3BhY2VRTmFt ZSA9IGRlY2wucHJlZml4KCkuaXNFbXB0eSgpID8gU3RyaW5nKCJ4bWxucyIpIDogU3RyaW5nKCJ4 bWxuczoiKTsKICAgICAgICAgbmFtZXNwYWNlUU5hbWUuYXBwZW5kKGRlY2wucHJlZml4KCkpOwot ICAgICAgICBuZXdFbGVtZW50LT5zZXRBdHRyaWJ1dGVOUygiaHR0cDovL3d3dy53My5vcmcvMjAw MC94bWxucy8iLCBuYW1lc3BhY2VRTmFtZSwgbmFtZXNwYWNlVVJJLCBlYywgc2NyaXB0aW5nUGVy bWlzc2lvbik7Ci0gICAgICAgIGlmIChlYykgLy8gZXhjZXB0aW9uIHNldHRpbmcgYXR0cmlidXRl cworCisgICAgICAgIFN0cmluZyBwcmVmaXgsIGxvY2FsTmFtZTsKKyAgICAgICAgaWYgKCFEb2N1 bWVudDo6cGFyc2VRdWFsaWZpZWROYW1lKG5hbWVzcGFjZVFOYW1lLCBwcmVmaXgsIGxvY2FsTmFt ZSwgZWMpKQogICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIHByZWZpeGVkQXR0cmlidXRl cy5hcHBlbmQoQXR0cmlidXRlKFF1YWxpZmllZE5hbWUocHJlZml4LCBsb2NhbE5hbWUsIFhNTE5T TmFtZXM6OnhtbG5zTmFtZXNwYWNlVVJJKSwgbmFtZXNwYWNlVVJJKSk7CiAgICAgfQogfQogCi1z dGF0aWMgaW5saW5lIHZvaWQgaGFuZGxlRWxlbWVudEF0dHJpYnV0ZXMoRWxlbWVudCogbmV3RWxl bWVudCwgY29uc3QgUVhtbFN0cmVhbUF0dHJpYnV0ZXMgJmF0dHJzLCBFeGNlcHRpb25Db2RlJiBl YywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBGcmFnbWVudFNj cmlwdGluZ1Blcm1pc3Npb24gc2NyaXB0aW5nUGVybWlzc2lvbikKK3N0YXRpYyBpbmxpbmUgdm9p ZCBoYW5kbGVFbGVtZW50QXR0cmlidXRlcyhWZWN0b3I8QXR0cmlidXRlLCA4PiYgcHJlZml4ZWRB dHRyaWJ1dGVzLCBjb25zdCBRWG1sU3RyZWFtQXR0cmlidXRlcyAmYXR0cnMsIEV4Y2VwdGlvbkNv ZGUmIGVjKQogewogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgYXR0cnMuY291bnQoKTsgKytpKSB7 CiAgICAgICAgIGNvbnN0IFFYbWxTdHJlYW1BdHRyaWJ1dGUgJmF0dHIgPSBhdHRyc1tpXTsKQEAg LTMzOCw5ICszMzksMTIgQEAgc3RhdGljIGlubGluZSB2b2lkIGhhbmRsZUVsZW1lbnRBdHRyaWJ1 dAogICAgICAgICBTdHJpbmcgYXR0clZhbHVlICAgICA9IGF0dHIudmFsdWUoKTsKICAgICAgICAg U3RyaW5nIGF0dHJVUkkgICAgICAgPSBhdHRyLm5hbWVzcGFjZVVyaSgpLmlzRW1wdHkoKSA/IFN0 cmluZygpIDogU3RyaW5nKGF0dHIubmFtZXNwYWNlVXJpKCkpOwogICAgICAgICBTdHJpbmcgYXR0 clFOYW1lICAgICA9IGF0dHIucXVhbGlmaWVkTmFtZSgpOwotICAgICAgICBuZXdFbGVtZW50LT5z ZXRBdHRyaWJ1dGVOUyhhdHRyVVJJLCBhdHRyUU5hbWUsIGF0dHJWYWx1ZSwgZWMsIHNjcmlwdGlu Z1Blcm1pc3Npb24pOwotICAgICAgICBpZiAoZWMpIC8vIGV4Y2VwdGlvbiBzZXR0aW5nIGF0dHJp YnV0ZXMKKworICAgICAgICBTdHJpbmcgcHJlZml4LCBsb2NhbE5hbWU7CisgICAgICAgIGlmICgh RG9jdW1lbnQ6OnBhcnNlUXVhbGlmaWVkTmFtZShhdHRyUU5hbWUsIHByZWZpeCwgbG9jYWxOYW1l LCBlYykpCiAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgcHJlZml4ZWRBdHRyaWJ1dGVz LmFwcGVuZChBdHRyaWJ1dGUoUXVhbGlmaWVkTmFtZShwcmVmaXgsIGxvY2FsTmFtZSwgYXR0clVS SSksIGF0dHJWYWx1ZSkpOwogICAgIH0KIH0KIApAQCAtNDU1LDE0ICs0NTksMTcgQEAgdm9pZCBY TUxEb2N1bWVudFBhcnNlcjo6cGFyc2VTdGFydEVsZW1lbgogICAgIGJvb2wgaXNGaXJzdEVsZW1l bnQgPSAhbV9zYXdGaXJzdEVsZW1lbnQ7CiAgICAgbV9zYXdGaXJzdEVsZW1lbnQgPSB0cnVlOwog CisgICAgVmVjdG9yPEF0dHJpYnV0ZSwgOD4gcHJlZml4ZWRBdHRyaWJ1dGVzOwogICAgIEV4Y2Vw dGlvbkNvZGUgZWMgPSAwOwotICAgIGhhbmRsZUVsZW1lbnROYW1lc3BhY2VzKG5ld0VsZW1lbnQu Z2V0KCksIG1fc3RyZWFtLm5hbWVzcGFjZURlY2xhcmF0aW9ucygpLCBlYywgbV9zY3JpcHRpbmdQ ZXJtaXNzaW9uKTsKKyAgICBoYW5kbGVOYW1lc3BhY2VBdHRyaWJ1dGVzKHByZWZpeGVkQXR0cmli dXRlcywgbV9zdHJlYW0ubmFtZXNwYWNlRGVjbGFyYXRpb25zKCksIGVjKTsKICAgICBpZiAoZWMp IHsKKyAgICAgICAgbmV3RWxlbWVudC0+cGFyc2VyU2V0QXR0cmlidXRlcyhwcmVmaXhlZEF0dHJp YnV0ZXMsIG1fc2NyaXB0aW5nUGVybWlzc2lvbik7CiAgICAgICAgIHN0b3BQYXJzaW5nKCk7CiAg ICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBoYW5kbGVFbGVtZW50QXR0cmlidXRlcyhuZXdF bGVtZW50LmdldCgpLCBtX3N0cmVhbS5hdHRyaWJ1dGVzKCksIGVjLCBtX3NjcmlwdGluZ1Blcm1p c3Npb24pOworICAgIGhhbmRsZUVsZW1lbnRBdHRyaWJ1dGVzKHByZWZpeGVkQXR0cmlidXRlcywg bV9zdHJlYW0uYXR0cmlidXRlcygpLCBlYyk7CisgICAgbmV3RWxlbWVudC0+cGFyc2VyU2V0QXR0 cmlidXRlcyhwcmVmaXhlZEF0dHJpYnV0ZXMsIG1fc2NyaXB0aW5nUGVybWlzc2lvbik7CiAgICAg aWYgKGVjKSB7CiAgICAgICAgIHN0b3BQYXJzaW5nKCk7CiAgICAgICAgIHJldHVybjsK