108557 2013-01-31 17:37:44 -0800 Continue making XSSAuditor thread safe: Remove unsafe AtomicString compares 2013-02-02 00:26:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106127 107603 1 tonyg tonyg abarth dbates ojan.autocc webkit.review.bot oldest_to_newest 822181 0 tonyg 2013-01-31 17:37:44 -0800 Continue making XSSAuditor thread safe: Remove unsafe AtomicString compares 822182 1 185906 tonyg 2013-01-31 17:39:24 -0800 Created attachment 185906 Patch 822183 2 tonyg 2013-01-31 17:40:12 -0800 All the other compares use equalIgnoringNullity() which looks thread safe to me. Please let me know if I'm missing anything. 822190 3 185906 eric 2013-01-31 17:46:12 -0800 Comment on attachment 185906 Patch We need to fix AtomicStrings to work on the parser thread, and make QualifiedName know how to ASSERT when x-thread compares are made. Separately, Adam would tell you we should share these functions until we do. I'm not sure where to put them w/o causing yourself an enourmous add-a-file headache. 822265 4 185906 abarth 2013-01-31 20:24:55 -0800 Comment on attachment 185906 Patch This patch is fine, but we should share this code, as Eric says. :) 822900 5 tonyg 2013-02-01 09:54:44 -0800 (In reply to comment #4) > (From update of attachment 185906 [details]) > This patch is fine, but we should share this code, as Eric says. :) Any preferences on where to put these methods? 823055 6 abarth 2013-02-01 11:41:27 -0800 I'd probably put them in a new header in the WebCore/html/parser directory. We can move them to a more general location later if that's needed. 823056 7 tonyg 2013-02-01 11:42:18 -0800 (In reply to comment #6) > I'd probably put them in a new header in the WebCore/html/parser directory. We can move them to a more general location later if that's needed. ThreadUtils.h? 823081 8 abarth 2013-02-01 11:56:24 -0800 Maybe we should add them to the existing HTMLParserIdioms.h ? 823144 9 186109 tonyg 2013-02-01 12:44:02 -0800 Created attachment 186109 Patch 823593 10 186109 webkit.review.bot 2013-02-02 00:26:55 -0800 Comment on attachment 186109 Patch Clearing flags on attachment: 186109 Committed r141686: <http://trac.webkit.org/changeset/141686> 823594 11 webkit.review.bot 2013-02-02 00:26:59 -0800 All reviewed patches have been landed. Closing bug. 185906 2013-01-31 17:39:24 -0800 2013-02-01 12:44:00 -0800 Patch bug-108557-20130131173607.patch text/plain 3178 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2NkYTg3ZWFmNjA4ZDE4 ODA1MGU0ZDY1MjBkMDQxZjkzNzQ1ZDMyMi4uMmU5ZTk2NjQ2NDk1MjE2Y2UzZjNhMzE0YzlhNDEz NjdhYzViOWZlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEzLTAxLTMxICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgQ29udGludWUgbWFr aW5nIFhTU0F1ZGl0b3IgdGhyZWFkIHNhZmU6IFJlbW92ZSB1bnNhZmUgQXRvbWljU3RyaW5nIGNv bXBhcmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDg1NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV bmZvcnR1bmF0ZWx5IEhUTUxOYW1lcyBjb21wYXJpc29ucyB3aWxsIGFsd2F5cyBiZSBmYWxzZSBv biBhIG5vbi1tYWluIHRocmVhZAorICAgICAgICB3aXRoIG91ciBjdXJyZW50IGRlc2lnbiwgc28g d2UgaGF2ZSB0byB1c2Ugc29tZSAidGhyZWFkU2FmZU1hdGNoIiBoZWxwZXJzIHdyaXR0ZW4KKyAg ICAgICAgZm9yIHRoZSBIVE1MQmFja2dyb3VuZFBhcnNlci4KKworICAgICAgICBObyBuZXcgdGVz dHMgYmVjYXVzZSBubyBuZXcgZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIGh0bWwvcGFyc2Vy L1hTU0F1ZGl0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6dGhyZWFkU2FmZUVxdWFsKToKKyAg ICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6dGhyZWFkU2FmZU1hdGNoKToKKyAg ICAgICAgKFdlYkNvcmU6OlhTU0F1ZGl0b3I6OmVyYXNlQXR0cmlidXRlSWZJbmplY3RlZCk6CisK KzIwMTMtMDEtMzEgIFRvbnkgR2VudGlsY29yZSAgPHRvbnlnQGNocm9taXVtLm9yZz4KKwogICAg ICAgICBCZWdpbiB0byBtYWtlIFhTU0F1ZGl0b3IgdGhyZWFkIGF3YXJlCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDgzOTQKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yLmNwcAppbmRleCBlNmM4MjQzMTZhNzg3MjVjMWZkNTNl MDk5NTMwNmNkOTY5Y2RhNDE3Li5jNzYzZDUzNmEwYTlmODdlNTBkOTgwMmRiZjc2NDNlM2U4Mjgz OWUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9YU1NBdWRpdG9yLmNwcApAQCAtMTEx LDYgKzExMSwxOCBAQCBzdGF0aWMgYm9vbCBzdGFydHNNdWx0aUxpbmVDb21tZW50QXQoY29uc3Qg U3RyaW5nJiBzdHJpbmcsIHNpemVfdCBzdGFydCkKICAgICByZXR1cm4gKHN0YXJ0ICsgMSA8IHN0 cmluZy5sZW5ndGgoKSAmJiBzdHJpbmdbc3RhcnRdID09ICcvJyAmJiBzdHJpbmdbc3RhcnQrMV0g PT0gJyonKTsKIH0KIAorc3RhdGljIGJvb2wgdGhyZWFkU2FmZUVxdWFsKFN0cmluZ0ltcGwqIGEs IFN0cmluZ0ltcGwqIGIpCit7CisgICAgaWYgKGEtPmhhc2goKSAhPSBiLT5oYXNoKCkpCisgICAg ICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4gU3RyaW5nSGFzaDo6ZXF1YWwoYSwgYik7Cit9 CisKK3N0YXRpYyBib29sIHRocmVhZFNhZmVNYXRjaChjb25zdCBRdWFsaWZpZWROYW1lJiBhLCBj b25zdCBRdWFsaWZpZWROYW1lJiBiKQoreworICAgIHJldHVybiB0aHJlYWRTYWZlRXF1YWwoYS5s b2NhbE5hbWUoKS5pbXBsKCksIGIubG9jYWxOYW1lKCkuaW1wbCgpKTsKK30KKwogc3RhdGljIGJv b2wgaGFzTmFtZShjb25zdCBIVE1MVG9rZW4mIHRva2VuLCBjb25zdCBRdWFsaWZpZWROYW1lJiBu YW1lKQogewogICAgIHJldHVybiBlcXVhbElnbm9yaW5nTnVsbGl0eSh0b2tlbi5uYW1lKCksIHN0 YXRpY19jYXN0PGNvbnN0IFN0cmluZyY+KG5hbWUubG9jYWxOYW1lKCkpKTsKQEAgLTQ4Niw5ICs0 OTgsOSBAQCBib29sIFhTU0F1ZGl0b3I6OmVyYXNlQXR0cmlidXRlSWZJbmplY3RlZChIVE1MVG9r ZW4mIHRva2VuLCBjb25zdCBRdWFsaWZpZWROYW1lJgogICAgIGlmIChmaW5kQXR0cmlidXRlV2l0 aE5hbWUodG9rZW4sIGF0dHJpYnV0ZU5hbWUsIGluZGV4T2ZBdHRyaWJ1dGUpKSB7CiAgICAgICAg IGNvbnN0IEhUTUxUb2tlbjo6QXR0cmlidXRlJiBhdHRyaWJ1dGUgPSB0b2tlbi5hdHRyaWJ1dGVz KCkuYXQoaW5kZXhPZkF0dHJpYnV0ZSk7CiAgICAgICAgIGlmIChpc0NvbnRhaW5lZEluUmVxdWVz dChkZWNvZGVkU25pcHBldEZvckF0dHJpYnV0ZSh0b2tlbiwgYXR0cmlidXRlLCB0cmVhdG1lbnQp KSkgewotICAgICAgICAgICAgaWYgKGF0dHJpYnV0ZU5hbWUgPT0gc3JjQXR0ciAmJiBpc0xpa2Vs eVNhZmVSZXNvdXJjZShTdHJpbmcoYXR0cmlidXRlLm1fdmFsdWUuZGF0YSgpLCBhdHRyaWJ1dGUu bV92YWx1ZS5zaXplKCkpKSkKKyAgICAgICAgICAgIGlmICh0aHJlYWRTYWZlTWF0Y2goYXR0cmli dXRlTmFtZSwgc3JjQXR0cikgJiYgaXNMaWtlbHlTYWZlUmVzb3VyY2UoU3RyaW5nKGF0dHJpYnV0 ZS5tX3ZhbHVlLmRhdGEoKSwgYXR0cmlidXRlLm1fdmFsdWUuc2l6ZSgpKSkpCiAgICAgICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgaWYgKGF0dHJpYnV0ZU5hbWUgPT0gaHR0 cF9lcXVpdkF0dHIgJiYgIWlzRGFuZ2Vyb3VzSFRUUEVxdWl2KFN0cmluZyhhdHRyaWJ1dGUubV92 YWx1ZS5kYXRhKCksIGF0dHJpYnV0ZS5tX3ZhbHVlLnNpemUoKSkpKQorICAgICAgICAgICAgaWYg KHRocmVhZFNhZmVNYXRjaChhdHRyaWJ1dGVOYW1lLCBodHRwX2VxdWl2QXR0cikgJiYgIWlzRGFu Z2Vyb3VzSFRUUEVxdWl2KFN0cmluZyhhdHRyaWJ1dGUubV92YWx1ZS5kYXRhKCksIGF0dHJpYnV0 ZS5tX3ZhbHVlLnNpemUoKSkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgICAgIHRva2VuLmVyYXNlVmFsdWVPZkF0dHJpYnV0ZShpbmRleE9mQXR0cmlidXRlKTsKICAg ICAgICAgICAgIGlmICghcmVwbGFjZW1lbnRWYWx1ZS5pc0VtcHR5KCkpCg== 186109 2013-02-01 12:44:02 -0800 2013-02-02 00:26:55 -0800 Patch bug-108557-20130201124045.patch text/plain 5851 tonyg U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxNjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjY4YzcyYTNmMWMwNjM5 Yjk3OTBiMjZiOWE0NjgxMzNhYzZlMjZlMS4uYjRiMjJkNGMxN2YyNGNjM2E2NGE4OGU4MzYxYzUx NDhmZTY5ZmQ1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAyLTAxICBUb255 IEdlbnRpbGNvcmUgIDx0b255Z0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ29udGludWUgbWFr aW5nIFhTU0F1ZGl0b3IgdGhyZWFkIHNhZmU6IFJlbW92ZSB1bnNhZmUgQXRvbWljU3RyaW5nIGNv bXBhcmVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MDg1NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV bmZvcnR1bmF0ZWx5IEhUTUxOYW1lcyBjb21wYXJpc29ucyB3aWxsIGFsd2F5cyBiZSBmYWxzZSBv biBhIG5vbi1tYWluIHRocmVhZAorICAgICAgICB3aXRoIG91ciBjdXJyZW50IGRlc2lnbiwgc28g d2UgaGF2ZSB0byB1c2Ugc29tZSAidGhyZWFkU2FmZU1hdGNoIiBoZWxwZXJzIHdyaXR0ZW4KKyAg ICAgICAgZm9yIHRoZSBIVE1MQmFja2dyb3VuZFBhcnNlci4KKworICAgICAgICBBbHNvIGZhY3Rv ciBvdXQgdGhyZWFkU2FmZU1hdGNoKCkgbWV0aG9kcyB0byBIVE1MUGFyc2VySWRpb21zLgorCisg ICAgICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIG5vIG5ldyBmdW5jdGlvbmFsaXR5LgorCisgICAg ICAgICogaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZSk6CisgICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFBhcnNlcklkaW9tcy5jcHA6CisgICAg ICAgIChXZWJDb3JlOjp0aHJlYWRTYWZlRXF1YWwpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgIChXZWJDb3JlOjp0aHJlYWRTYWZlTWF0Y2gpOgorICAgICAgICAqIGh0bWwvcGFyc2VyL0hU TUxQYXJzZXJJZGlvbXMuaDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIGh0bWwvcGFy c2VyL1hTU0F1ZGl0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WFNTQXVkaXRvcjo6ZXJhc2VB dHRyaWJ1dGVJZkluamVjdGVkKToKKwogMjAxMy0wMi0wMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBh cHBsZS5jb20+CiAKICAgICAgICAgU3BlY3VsYXRpdmUgV2luZG93cyBidWlsZCBmaXguIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvQmFja2dyb3VuZEhUTUxQYXJzZXIuY3Bw CmluZGV4IGVjNDYxNTJhMWM3ODYyYmZiOWYxZmRhODI3ZmZhOTFmZDU2MzQ4YzYuLmI5YzI2NDlk ZTY4MzE2OTMyMjVjMjUxZDQ0NzJiYjY2ZDA2NGY1NmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0JhY2tncm91bmRIVE1MUGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9CYWNrZ3JvdW5kSFRNTFBhcnNlci5jcHAKQEAgLTMxLDYgKzMxLDcg QEAKIAogI2luY2x1ZGUgIkhUTUxEb2N1bWVudFBhcnNlci5oIgogI2luY2x1ZGUgIkhUTUxOYW1l cy5oIgorI2luY2x1ZGUgIkhUTUxQYXJzZXJJZGlvbXMuaCIKICNpbmNsdWRlICJIVE1MUGFyc2Vy VGhyZWFkLmgiCiAjaW5jbHVkZSAiSFRNTFRva2VuaXplci5oIgogI2luY2x1ZGUgIk1hdGhNTE5h bWVzLmgiCkBAIC01NiwxOCArNTcsNiBAQCBzdGF0aWMgdm9pZCBjaGVja1RoYXRUb2tlbnNBcmVT YWZlVG9TZW5kVG9Bbm90aGVyVGhyZWFkKGNvbnN0IENvbXBhY3RIVE1MVG9rZW5TdAogLy8gRklY TUU6IFR1bmUgdGhpcyBjb25zdGFudCBiYXNlZCBvbiBhIGJlbmNobWFyay4gVGhlIGN1cnJlbnQg dmFsdWUgd2FzIGNob29zZW4gYXJiaXRyYXJpbHkuCiBzdGF0aWMgY29uc3Qgc2l6ZV90IHBlbmRp bmdUb2tlbkxpbWl0ID0gNDAwMDsKIAotc3RhdGljIGJvb2wgdGhyZWFkU2FmZUVxdWFsKFN0cmlu Z0ltcGwqIGEsIFN0cmluZ0ltcGwqIGIpCi17Ci0gICAgaWYgKGEtPmhhc2goKSAhPSBiLT5oYXNo KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICByZXR1cm4gU3RyaW5nSGFzaDo6ZXF1YWwo YSwgYik7Ci19Ci0KLXN0YXRpYyBib29sIHRocmVhZFNhZmVNYXRjaChjb25zdCBTdHJpbmcmIGxv Y2FsTmFtZSwgY29uc3QgUXVhbGlmaWVkTmFtZSYgcU5hbWUpCi17Ci0gICAgcmV0dXJuIHRocmVh ZFNhZmVFcXVhbChsb2NhbE5hbWUuaW1wbCgpLCBxTmFtZS5sb2NhbE5hbWUoKS5pbXBsKCkpOwot fQotCiBQYXJzZXJNYXAmIHBhcnNlck1hcCgpCiB7CiAgICAgLy8gVGhpcyBpbml0aWFsaXphdGlv biBhc3N1bWVzIHRoYXQgdGhpcyB3aWxsIGJlIGluaXRpYWxpemUgb24gdGhlIG1haW4gdGhyZWFk IGJlZm9yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFBhcnNl cklkaW9tcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21z LmNwcAppbmRleCBlNTIwMWNlMTNiNWFlNDM1YTc3YmVlYjZiMzdlOWJhZjdjNDI2NDE2Li4yY2E5 NDNlZmE3Zjg0MTA3MWQwMDhhZGQ5NzU0ZTJjY2E5ODUxNjUzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmNwcApAQCAtMjYsMTAgKzI2LDEyIEBA CiAjaW5jbHVkZSAiSFRNTFBhcnNlcklkaW9tcy5oIgogCiAjaW5jbHVkZSAiRGVjaW1hbC5oIgor I2luY2x1ZGUgIlF1YWxpZmllZE5hbWUuaCIKICNpbmNsdWRlIDxsaW1pdHM+CiAjaW5jbHVkZSA8 d3RmL01hdGhFeHRyYXMuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9BdG9taWNTdHJpbmcuaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdCdWlsZGVyLmg+CisjaW5jbHVkZSA8d3RmL3RleHQvU3Ry aW5nSGFzaC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTI3NSw0ICsyNzcsMjEgQEAg Ym9vbCBwYXJzZUhUTUxOb25OZWdhdGl2ZUludGVnZXIoY29uc3QgU3RyaW5nJiBpbnB1dCwgdW5z aWduZWQmIHZhbHVlKQogICAgIHJldHVybiBwYXJzZUhUTUxOb25OZWdhdGl2ZUludGVnZXJJbnRl cm5hbChzdGFydCwgc3RhcnQgKyBsZW5ndGgsIHZhbHVlKTsKIH0KIAorc3RhdGljIGJvb2wgdGhy ZWFkU2FmZUVxdWFsKFN0cmluZ0ltcGwqIGEsIFN0cmluZ0ltcGwqIGIpCit7CisgICAgaWYgKGEt Pmhhc2goKSAhPSBiLT5oYXNoKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXR1cm4g U3RyaW5nSGFzaDo6ZXF1YWwoYSwgYik7Cit9CisKK2Jvb2wgdGhyZWFkU2FmZU1hdGNoKGNvbnN0 IFF1YWxpZmllZE5hbWUmIGEsIGNvbnN0IFF1YWxpZmllZE5hbWUmIGIpCit7CisgICAgcmV0dXJu IHRocmVhZFNhZmVFcXVhbChhLmxvY2FsTmFtZSgpLmltcGwoKSwgYi5sb2NhbE5hbWUoKS5pbXBs KCkpOworfQorCitib29sIHRocmVhZFNhZmVNYXRjaChjb25zdCBTdHJpbmcmIGxvY2FsTmFtZSwg Y29uc3QgUXVhbGlmaWVkTmFtZSYgcU5hbWUpCit7CisgICAgcmV0dXJuIHRocmVhZFNhZmVFcXVh bChsb2NhbE5hbWUuaW1wbCgpLCBxTmFtZS5sb2NhbE5hbWUoKS5pbXBsKCkpOworfQorCiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmgg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MUGFyc2VySWRpb21zLmgKaW5kZXggNTc3 ZTAyZTg1ZDU3MjRiZGQzMmU4ODFiNTQ0ZjhhZmVkODY3YTk4YS4uNTNkMGZmNzkzNWYyMDUyMDNh ZjQwYWUyMDVjMGQ3MzRhNmQzOTliMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9w YXJzZXIvSFRNTFBhcnNlcklkaW9tcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFyc2Vy L0hUTUxQYXJzZXJJZGlvbXMuaApAQCAtMzEsNiArMzEsNyBAQAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBjbGFzcyBEZWNpbWFsOworY2xhc3MgUXVhbGlmaWVkTmFtZTsKIAogLy8gU3BhY2UgY2hh cmFjdGVycyBhcyBkZWZpbmVkIGJ5IHRoZSBIVE1MIHNwZWNpZmljYXRpb24uCiBib29sIGlzSFRN TFNwYWNlKFVDaGFyKTsKQEAgLTg1LDYgKzg2LDkgQEAgaW5saW5lIGJvb2wgaXNOb3RIVE1MU3Bh Y2UoVUNoYXIgY2hhcmFjdGVyKQogICAgIHJldHVybiAhaXNIVE1MU3BhY2UoY2hhcmFjdGVyKTsK IH0KIAorYm9vbCB0aHJlYWRTYWZlTWF0Y2goY29uc3QgUXVhbGlmaWVkTmFtZSYsIGNvbnN0IFF1 YWxpZmllZE5hbWUmKTsKK2Jvb2wgdGhyZWFkU2FmZU1hdGNoKGNvbnN0IFN0cmluZyYsIGNvbnN0 IFF1YWxpZmllZE5hbWUmKTsKKwogfQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL1hTU0F1ZGl0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJz ZXIvWFNTQXVkaXRvci5jcHAKaW5kZXggYTM0MTMyZDJjMDVhMzZlZmUxNTVkOWI5ZjU0ZDEyNDRm ZjdjNzVkMi4uZmY2OThhNWY2ZDhjYThlZGE2ZjE0YmFlZjEwM2U0OTNlZGMxZWZmNiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvWFNTQXVkaXRvci5jcHAKQEAgLTQ4Nyw5ICs0ODcsOSBA QCBib29sIFhTU0F1ZGl0b3I6OmVyYXNlQXR0cmlidXRlSWZJbmplY3RlZChIVE1MVG9rZW4mIHRv a2VuLCBjb25zdCBRdWFsaWZpZWROYW1lJgogICAgIGlmIChmaW5kQXR0cmlidXRlV2l0aE5hbWUo dG9rZW4sIGF0dHJpYnV0ZU5hbWUsIGluZGV4T2ZBdHRyaWJ1dGUpKSB7CiAgICAgICAgIGNvbnN0 IEhUTUxUb2tlbjo6QXR0cmlidXRlJiBhdHRyaWJ1dGUgPSB0b2tlbi5hdHRyaWJ1dGVzKCkuYXQo aW5kZXhPZkF0dHJpYnV0ZSk7CiAgICAgICAgIGlmIChpc0NvbnRhaW5lZEluUmVxdWVzdChkZWNv ZGVkU25pcHBldEZvckF0dHJpYnV0ZSh0b2tlbiwgYXR0cmlidXRlLCB0cmVhdG1lbnQpKSkgewot ICAgICAgICAgICAgaWYgKGF0dHJpYnV0ZU5hbWUgPT0gc3JjQXR0ciAmJiBpc0xpa2VseVNhZmVS ZXNvdXJjZShTdHJpbmcoYXR0cmlidXRlLm1fdmFsdWUuZGF0YSgpLCBhdHRyaWJ1dGUubV92YWx1 ZS5zaXplKCkpKSkKKyAgICAgICAgICAgIGlmICh0aHJlYWRTYWZlTWF0Y2goYXR0cmlidXRlTmFt ZSwgc3JjQXR0cikgJiYgaXNMaWtlbHlTYWZlUmVzb3VyY2UoU3RyaW5nKGF0dHJpYnV0ZS5tX3Zh bHVlLmRhdGEoKSwgYXR0cmlidXRlLm1fdmFsdWUuc2l6ZSgpKSkpCiAgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgICAgICAgICAgaWYgKGF0dHJpYnV0ZU5hbWUgPT0gaHR0cF9lcXVp dkF0dHIgJiYgIWlzRGFuZ2Vyb3VzSFRUUEVxdWl2KFN0cmluZyhhdHRyaWJ1dGUubV92YWx1ZS5k YXRhKCksIGF0dHJpYnV0ZS5tX3ZhbHVlLnNpemUoKSkpKQorICAgICAgICAgICAgaWYgKHRocmVh ZFNhZmVNYXRjaChhdHRyaWJ1dGVOYW1lLCBodHRwX2VxdWl2QXR0cikgJiYgIWlzRGFuZ2Vyb3Vz SFRUUEVxdWl2KFN0cmluZyhhdHRyaWJ1dGUubV92YWx1ZS5kYXRhKCksIGF0dHJpYnV0ZS5tX3Zh bHVlLnNpemUoKSkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAg IHRva2VuLmVyYXNlVmFsdWVPZkF0dHJpYnV0ZShpbmRleE9mQXR0cmlidXRlKTsKICAgICAgICAg ICAgIGlmICghcmVwbGFjZW1lbnRWYWx1ZS5pc0VtcHR5KCkpCg==