165334 2016-12-02 13:56:33 -0800 [CSS Parser] Need to set edit flags properly when user-modify/select are used. 2016-12-02 14:07:45 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt oldest_to_newest 1255866 0 hyatt 2016-12-02 13:56:33 -0800 [CSS Parser] Need to set edit flags properly when user-modify/select are used. 1255877 1 295997 hyatt 2016-12-02 14:01:54 -0800 Created attachment 295997 Patch 1255883 2 hyatt 2016-12-02 14:07:45 -0800 Fixed in r209265. 295997 2016-12-02 14:01:54 -0800 2016-12-02 14:05:05 -0800 Patch bug-165334-20161202160123.patch text/plain 18975 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwOTI2MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE2LTEyLTAyICBEYXZlIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFtDU1MgUGFyc2VyXSBOZWVkIHRvIHNl dCBlZGl0IGZsYWdzIHByb3Blcmx5IHdoZW4gdXNlci1tb2RpZnkvc2VsZWN0IGFyZSB1c2VkLgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY1MzM0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG9sZCBw YXJzZXIgY2FsbHMgcGFyc2VyU2V0VXNlc1N0eWxlQmFzZWRFZGl0YWJpbGl0eSBvbgorICAgICAg ICBTdHlsZVNoZWV0Q29udGVudHMqIGZyb20gaW5zaWRlIGlzVmFsaWRLZXl3b3JkUHJvcGVydHlB bmRWYWx1ZS4gVGhpcworICAgICAgICBpcyBwcmV0dHkgbGFtZSwgYnV0IHdlIGhhdmUgdG8gZG8g dGhlIHNhbWUgaW4gb3JkZXIgdG8gcGFzcyBlZGl0aW5nCisgICAgICAgIGxheW91dCB0ZXN0cy4K KworICAgICAgICBBbGwgb2YgdGhlIGZ1bmN0aW9ucyBiZWxvdyBoYXZlIGJlZW4gcGF0Y2hlZCB3 aXRoIHRoZSBzb2xlIHB1cnBvc2Ugb2YKKyAgICAgICAgcHJvcGFnYXRpbmcgU3R5bGVTaGVldENv bnRlbnRzKiB0aHJvdWdoIHRvIGlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZQorICAgICAg ICBpbiB0aGUgbmV3IHBhcnNlci4KKworICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VyLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlcjo6cGFyc2VWYWx1ZVdpdGhWYXJpYWJsZVJl ZmVyZW5jZXMpOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NTUGFyc2VyLmg6CisgICAgICAgICog Y3NzL3BhcnNlci9DU1NQYXJzZXJGYXN0UGF0aHMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NT UGFyc2VyRmFzdFBhdGhzOjppc1ZhbGlkS2V5d29yZFByb3BlcnR5QW5kVmFsdWUpOgorICAgICAg ICAoV2ViQ29yZTo6cGFyc2VLZXl3b3JkVmFsdWUpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTUGFy c2VyRmFzdFBhdGhzOjptYXliZVBhcnNlVmFsdWUpOgorICAgICAgICAqIGNzcy9wYXJzZXIvQ1NT UGFyc2VyRmFzdFBhdGhzLmg6CisgICAgICAgICogY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1BhcnNlckltcGw6OmNvbnN1bWVEZWNsYXJhdGlvblZh bHVlKToKKyAgICAgICAgKiBjc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpDU1NQcm9wZXJ0eVBhcnNlcik6CisgICAg ICAgIChXZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlcjo6cGFyc2VWYWx1ZSk6CisgICAgICAgIChX ZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlcjo6cGFyc2VTaW5nbGVWYWx1ZSk6CisgICAgICAgIChX ZWJDb3JlOjpDU1NQcm9wZXJ0eVBhcnNlcjo6cGFyc2VGb250RmFjZURlc2NyaXB0b3IpOgorICAg ICAgICAoV2ViQ29yZTo6Q1NTUHJvcGVydHlQYXJzZXI6OmNvbnN1bWVGb250KToKKyAgICAgICAg KFdlYkNvcmU6OkNTU1Byb3BlcnR5UGFyc2VyOjpwYXJzZVNob3J0aGFuZCk6CisgICAgICAgICog Y3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5oOgorCiAyMDE2LTEyLTAyICBKb2huIFdpbGFu ZGVyICA8d2lsYW5kZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlcXVpcmUgcHJlZmxpZ2h0IGZv ciBub24tc3RhbmRhcmQgQ09SUy1zYWZlbGlzdGVkIHJlcXVlc3QgaGVhZGVycyBBY2NlcHQsIEFj Y2VwdC1MYW5ndWFnZSwgYW5kIENvbnRlbnQtTGFuZ3VhZ2UKSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2Nzcy9wYXJzZXIvQ1NTUGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9j c3MvcGFyc2VyL0NTU1BhcnNlci5jcHAJKHJldmlzaW9uIDIwODk5OSkKKysrIFNvdXJjZS9XZWJD b3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTgyMCw2ICsx ODIwLDcgQEAgdm9pZCBDU1NQYXJzZXI6OmFkZEV4cGFuZGVkUHJvcGVydHlGb3JWYQogCiBSZWZQ dHI8Q1NTVmFsdWU+IENTU1BhcnNlcjo6cGFyc2VWYWx1ZVdpdGhWYXJpYWJsZVJlZmVyZW5jZXMo Q1NTUHJvcGVydHlJRCBwcm9wSUQsIGNvbnN0IENTU1ZhbHVlJiB2YWx1ZSwgY29uc3QgQ3VzdG9t UHJvcGVydHlWYWx1ZU1hcCYgY3VzdG9tUHJvcGVydGllcywgVGV4dERpcmVjdGlvbiBkaXJlY3Rp b24sIFdyaXRpbmdNb2RlIHdyaXRpbmdNb2RlKQogeworICAgIC8vIEZJWE1FLU5FV1BBUlNFUjog UmVtb3ZlIHRoaXMgYmxvY2sgd2hlbiBvbGQgcGFyc2VyIGdvZXMgYXdheS4KICAgICBpZiAodmFs dWUuaXNWYXJpYWJsZURlcGVuZGVudFZhbHVlKCkpIHsKICAgICAgICAgY29uc3QgQ1NTVmFyaWFi bGVEZXBlbmRlbnRWYWx1ZSYgZGVwZW5kZW50VmFsdWUgPSBkb3duY2FzdDxDU1NWYXJpYWJsZURl cGVuZGVudFZhbHVlPih2YWx1ZSk7CiAgICAgICAgIG1fdmFsdWVMaXN0LnJlc2V0KG5ldyBDU1NQ YXJzZXJWYWx1ZUxpc3QoKSk7CkBAIC0xODU3LDcgKzE4NTgsNyBAQCBSZWZQdHI8Q1NTVmFsdWU+ IENTU1BhcnNlcjo6cGFyc2VWYWx1ZVdpCiAgICAgICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICAgICAgCiAgICAgICAgIFBhcnNlZFByb3BlcnR5VmVjdG9yIHBhcnNlZFByb3BlcnRpZXM7Ci0g ICAgICAgIGlmICghQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlVmFsdWUoc2hvcnRoYW5kSUQsIGZh bHNlLCByZXNvbHZlZFRva2VucywgbV9jb250ZXh0LCBwYXJzZWRQcm9wZXJ0aWVzLCBTdHlsZVJ1 bGU6OlN0eWxlKSkKKyAgICAgICAgaWYgKCFDU1NQcm9wZXJ0eVBhcnNlcjo6cGFyc2VWYWx1ZShz aG9ydGhhbmRJRCwgZmFsc2UsIHJlc29sdmVkVG9rZW5zLCBtX2NvbnRleHQsIG51bGxwdHIsIHBh cnNlZFByb3BlcnRpZXMsIFN0eWxlUnVsZTo6U3R5bGUpKQogICAgICAgICAgICAgcmV0dXJuIG51 bGxwdHI7CiAgICAgICAgIAogICAgICAgICBmb3IgKGF1dG8mIHByb3BlcnR5IDogcGFyc2VkUHJv cGVydGllcykgewpAQCAtMTg3Nyw3ICsxODc4LDcgQEAgUmVmUHRyPENTU1ZhbHVlPiBDU1NQYXJz ZXI6OnBhcnNlVmFsdWVXaQogICAgICAgICBpZiAoIXZhcmlhYmxlRGF0YS0+cmVzb2x2ZVRva2Vu UmFuZ2UoY3VzdG9tUHJvcGVydGllcywgdmFyaWFibGVEYXRhLT50b2tlbnMoKSwgcmVzb2x2ZWRU b2tlbnMpKQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgICAgIAotICAgICAgICBy ZXR1cm4gQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlU2luZ2xlVmFsdWUocHJvcElELCByZXNvbHZl ZFRva2VucywgbV9jb250ZXh0KTsKKyAgICAgICAgcmV0dXJuIENTU1Byb3BlcnR5UGFyc2VyOjpw YXJzZVNpbmdsZVZhbHVlKHByb3BJRCwgcmVzb2x2ZWRUb2tlbnMsIG1fY29udGV4dCwgbnVsbHB0 cik7CiAgICAgfQogICAgIAogICAgIHJldHVybiBudWxscHRyOwpJbmRleDogU291cmNlL1dlYkNv cmUvY3NzL3BhcnNlci9DU1NQYXJzZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9j c3MvcGFyc2VyL0NTU1BhcnNlci5oCShyZXZpc2lvbiAyMDg5OTkpCisrKyBTb3VyY2UvV2ViQ29y ZS9jc3MvcGFyc2VyL0NTU1BhcnNlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMzcsNyArMTM3LDcg QEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHBhcnNlRGVjbGFyYXRpb25Gb3JJbnNwZWN0b3Io Y29uc3QgQ1NTUGFyc2VyQ29udGV4dCYsIGNvbnN0IFN0cmluZyYsIENTU1BhcnNlck9ic2VydmVy Jik7CiAKICAgICBzdGF0aWMgUGFyc2VSZXN1bHQgcGFyc2VWYWx1ZShNdXRhYmxlU3R5bGVQcm9w ZXJ0aWVzJiwgQ1NTUHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiwgYm9vbCBpbXBvcnRhbnQsIGNv bnN0IENTU1BhcnNlckNvbnRleHQmLCBTdHlsZVNoZWV0Q29udGVudHMqKTsKLSAgICBzdGF0aWMg UGFyc2VSZXN1bHQgcGFyc2VDdXN0b21Qcm9wZXJ0eVZhbHVlKE11dGFibGVTdHlsZVByb3BlcnRp ZXMmLCBjb25zdCBBdG9taWNTdHJpbmcmIHByb3BlcnR5TmFtZSwgY29uc3QgU3RyaW5nJiwgYm9v bCBpbXBvcnRhbnQsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmLCBTdHlsZVNoZWV0Q29udGVudHMq IGNvbnRleHRTdHlsZVNoZWV0KTsKKyAgICBzdGF0aWMgUGFyc2VSZXN1bHQgcGFyc2VDdXN0b21Q cm9wZXJ0eVZhbHVlKE11dGFibGVTdHlsZVByb3BlcnRpZXMmLCBjb25zdCBBdG9taWNTdHJpbmcm IHByb3BlcnR5TmFtZSwgY29uc3QgU3RyaW5nJiwgYm9vbCBpbXBvcnRhbnQsIGNvbnN0IENTU1Bh cnNlckNvbnRleHQmLCBTdHlsZVNoZWV0Q29udGVudHMqKTsKIAogICAgIHN0YXRpYyBDb2xvciBw YXJzZUNvbG9yKGNvbnN0IFN0cmluZyYsIGJvb2wgc3RyaWN0ID0gZmFsc2UpOwogICAgIHN0YXRp YyBib29sIGlzVmFsaWRTeXN0ZW1Db2xvclZhbHVlKENTU1ZhbHVlSUQpOwpJbmRleDogU291cmNl L1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJGYXN0UGF0aHMuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUGFyc2VyRmFzdFBhdGhzLmNwcAkocmV2aXNp b24gMjA5MjA1KQorKysgU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJGYXN0UGF0 aHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw2ICs0Miw3IEBACiAjaW5jbHVkZSAiUnVudGlt ZUVuYWJsZWRGZWF0dXJlcy5oIgogI2luY2x1ZGUgIlN0eWxlQ29sb3IuaCIKICNpbmNsdWRlICJT dHlsZVByb3BlcnR5U2hvcnRoYW5kLmgiCisjaW5jbHVkZSAiU3R5bGVTaGVldENvbnRlbnRzLmgi CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtNDk2LDcgKzQ5Nyw3IEBAIFJlZlB0cjxDU1NW YWx1ZT4gQ1NTUGFyc2VyRmFzdFBhdGhzOjpwYXIKICAgICByZXR1cm4gQ1NTVmFsdWVQb29sOjpz aW5nbGV0b24oKS5jcmVhdGVDb2xvclZhbHVlKGNvbG9yKTsKIH0KIAotYm9vbCBDU1NQYXJzZXJG YXN0UGF0aHM6OmlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZShDU1NQcm9wZXJ0eUlEIHBy b3BlcnR5SWQsIENTU1ZhbHVlSUQgdmFsdWVJRCwgQ1NTUGFyc2VyTW9kZSBwYXJzZXJNb2RlKQor Ym9vbCBDU1NQYXJzZXJGYXN0UGF0aHM6OmlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZShD U1NQcm9wZXJ0eUlEIHByb3BlcnR5SWQsIENTU1ZhbHVlSUQgdmFsdWVJRCwgQ1NTUGFyc2VyTW9k ZSBwYXJzZXJNb2RlLCBTdHlsZVNoZWV0Q29udGVudHMqIHN0eWxlU2hlZXRDb250ZW50cykKIHsK ICAgICBpZiAodmFsdWVJRCA9PSBDU1NWYWx1ZUludmFsaWQgfHwgIWlzVmFsdWVBbGxvd2VkSW5N b2RlKHZhbHVlSUQsIHBhcnNlck1vZGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC03NDcs OSArNzQ4LDIxIEBAIGJvb2wgQ1NTUGFyc2VyRmFzdFBhdGhzOjppc1ZhbGlkS2V5d29yZFAKICAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VXNlckRyYWc6IC8vIGF1dG8gfCBub25lIHwgZWxlbWVu dAogICAgICAgICByZXR1cm4gdmFsdWVJRCA9PSBDU1NWYWx1ZUF1dG8gfHwgdmFsdWVJRCA9PSBD U1NWYWx1ZU5vbmUgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUVsZW1lbnQ7CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eVdlYmtpdFVzZXJNb2RpZnk6IC8vIHJlYWQtb25seSB8IHJlYWQtd3JpdGUKLSAgICAg ICAgcmV0dXJuIHZhbHVlSUQgPT0gQ1NTVmFsdWVSZWFkT25seSB8fCB2YWx1ZUlEID09IENTU1Zh bHVlUmVhZFdyaXRlIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVSZWFkV3JpdGVQbGFpbnRleHRPbmx5 OworICAgICAgICBpZiAodmFsdWVJRCA9PSBDU1NWYWx1ZVJlYWRPbmx5IHx8IHZhbHVlSUQgPT0g Q1NTVmFsdWVSZWFkV3JpdGUgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVJlYWRXcml0ZVBsYWludGV4 dE9ubHkpIHsKKyAgICAgICAgICAgIGlmIChzdHlsZVNoZWV0Q29udGVudHMpCisgICAgICAgICAg ICAgICAgc3R5bGVTaGVldENvbnRlbnRzLT5wYXJzZXJTZXRVc2VzU3R5bGVCYXNlZEVkaXRhYmls aXR5KCk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFVzZXJTZWxlY3Q6IC8vIGF1dG8g fCBub25lIHwgdGV4dCB8IGFsbAotICAgICAgICByZXR1cm4gdmFsdWVJRCA9PSBDU1NWYWx1ZUF1 dG8gfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZU5vbmUgfHwgdmFsdWVJRCA9PSBDU1NWYWx1ZVRleHQg fHwgdmFsdWVJRCA9PSBDU1NWYWx1ZUFsbDsKKyAgICAgICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFs dWVBdXRvIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVOb25lIHx8IHZhbHVlSUQgPT0gQ1NTVmFsdWVU ZXh0KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmICh2YWx1ZUlEID09IENT U1ZhbHVlQWxsKSB7CisgICAgICAgICAgICBpZiAoc3R5bGVTaGVldENvbnRlbnRzKQorICAgICAg ICAgICAgICAgIHN0eWxlU2hlZXRDb250ZW50cy0+cGFyc2VyU2V0VXNlc1N0eWxlQmFzZWRFZGl0 YWJpbGl0eSgpOworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIH0KKyAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgIGNhc2UgQ1NTUHJvcGVydHlXcml0aW5nTW9kZToKICAgICAgICAg Ly8gTm90ZSB0aGF0IGhvcml6b250YWwtYnQgaXMgbm90IHN1cHBvcnRlZCBieSB0aGUgdW5wcmVm aXhlZCB2ZXJzaW9uIG9mCiAgICAgICAgIC8vIHRoZSBwcm9wZXJ0eSwgb25seSBieSB0aGUgLXdl YmtpdC0gdmVyc2lvbi4KQEAgLTEwMTMsNyArMTAyNiw3IEBAIHN0YXRpYyBib29sIGlzVW5pdmVy c2FsS2V5d29yZChjb25zdCBTdHIKICAgICB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2Fz ZShzdHJpbmcsICJyZXZlcnQiKTsKIH0KIAotc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gcGFyc2VL ZXl3b3JkVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlkLCBjb25zdCBTdHJpbmcmIHN0cmlu ZywgQ1NTUGFyc2VyTW9kZSBwYXJzZXJNb2RlKQorc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4gcGFy c2VLZXl3b3JkVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlkLCBjb25zdCBTdHJpbmcmIHN0 cmluZywgQ1NTUGFyc2VyTW9kZSBwYXJzZXJNb2RlLCBTdHlsZVNoZWV0Q29udGVudHMqIHN0eWxl U2hlZXRDb250ZW50cykKIHsKICAgICBBU1NFUlQoIXN0cmluZy5pc0VtcHR5KCkpOwogCkBAIC0x MDQ1LDcgKzEwNTgsNyBAQCBzdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBwYXJzZUtleXdvcmRWYWx1 CiAgICAgaWYgKHZhbHVlSUQgPT0gQ1NTVmFsdWVSZXZlcnQpCiAgICAgICAgIHJldHVybiBDU1NW YWx1ZVBvb2w6OnNpbmdsZXRvbigpLmNyZWF0ZVJldmVydFZhbHVlKCk7CiAgICAgCi0gICAgaWYg KENTU1BhcnNlckZhc3RQYXRoczo6aXNWYWxpZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKHByb3Bl cnR5SWQsIHZhbHVlSUQsIHBhcnNlck1vZGUpKQorICAgIGlmIChDU1NQYXJzZXJGYXN0UGF0aHM6 OmlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZShwcm9wZXJ0eUlkLCB2YWx1ZUlELCBwYXJz ZXJNb2RlLCBzdHlsZVNoZWV0Q29udGVudHMpKQogICAgICAgICByZXR1cm4gQ1NTUHJpbWl0aXZl VmFsdWU6OmNyZWF0ZUlkZW50aWZpZXIodmFsdWVJRCk7CiAgICAgcmV0dXJuIG51bGxwdHI7CiB9 CkBAIC0xMjU2LDE0ICsxMjY5LDE0IEBAIHN0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+IHBhcnNlU2lt cGxlVHJhbnMKICAgICByZXR1cm4gcGFyc2VTaW1wbGVUcmFuc2Zvcm1MaXN0KHN0cmluZy5jaGFy YWN0ZXJzMTYoKSwgc3RyaW5nLmxlbmd0aCgpKTsKIH0KIAotUmVmUHRyPENTU1ZhbHVlPiBDU1NQ YXJzZXJGYXN0UGF0aHM6Om1heWJlUGFyc2VWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQs IGNvbnN0IFN0cmluZyYgc3RyaW5nLCBDU1NQYXJzZXJNb2RlIHBhcnNlck1vZGUpCitSZWZQdHI8 Q1NTVmFsdWU+IENTU1BhcnNlckZhc3RQYXRoczo6bWF5YmVQYXJzZVZhbHVlKENTU1Byb3BlcnR5 SUQgcHJvcGVydHlJRCwgY29uc3QgU3RyaW5nJiBzdHJpbmcsIENTU1BhcnNlck1vZGUgcGFyc2Vy TW9kZSwgU3R5bGVTaGVldENvbnRlbnRzKiBzdHlsZVNoZWV0Q29udGVudHMpCiB7CiAgICAgUmVm UHRyPENTU1ZhbHVlPiByZXN1bHQgPSBwYXJzZVNpbXBsZUxlbmd0aFZhbHVlKHByb3BlcnR5SUQs IHN0cmluZywgcGFyc2VyTW9kZSk7CiAgICAgaWYgKHJlc3VsdCkKICAgICAgICAgcmV0dXJuIHJl c3VsdDsKICAgICBpZiAoaXNDb2xvclByb3BlcnR5SUQocHJvcGVydHlJRCkpCiAgICAgICAgIHJl dHVybiBwYXJzZUNvbG9yKHN0cmluZywgcGFyc2VyTW9kZSk7Ci0gICAgcmVzdWx0ID0gcGFyc2VL ZXl3b3JkVmFsdWUocHJvcGVydHlJRCwgc3RyaW5nLCBwYXJzZXJNb2RlKTsKKyAgICByZXN1bHQg PSBwYXJzZUtleXdvcmRWYWx1ZShwcm9wZXJ0eUlELCBzdHJpbmcsIHBhcnNlck1vZGUsIHN0eWxl U2hlZXRDb250ZW50cyk7CiAgICAgaWYgKHJlc3VsdCkKICAgICAgICAgcmV0dXJuIHJlc3VsdDsK ICAgICByZXN1bHQgPSBwYXJzZVNpbXBsZVRyYW5zZm9ybShwcm9wZXJ0eUlELCBzdHJpbmcpOwpJ bmRleDogU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJGYXN0UGF0aHMuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckZhc3RQYXRocy5o CShyZXZpc2lvbiAyMDg5OTkpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNl ckZhc3RQYXRocy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNywxNiArMzcsMTcgQEAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAogY2xhc3MgQ1NTVmFsdWU7CitjbGFzcyBTdHlsZVNoZWV0Q29udGVudHM7 CiAKIGNsYXNzIENTU1BhcnNlckZhc3RQYXRocyB7CiBwdWJsaWM6CiAgICAgLy8gUGFyc2VzIHNp bXBsZSB2YWx1ZXMgbGlrZSAnMTBweCcgb3IgJ2dyZWVuJywgYnV0IG1ha2VzIG5vIGd1YXJhbnRl ZXMKICAgICAvLyBhYm91dCBoYW5kbGluZyBhbnkgcHJvcGVydHkgY29tcGxldGVseS4KLSAgICBz dGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBtYXliZVBhcnNlVmFsdWUoQ1NTUHJvcGVydHlJRCwgY29u c3QgU3RyaW5nJiwgQ1NTUGFyc2VyTW9kZSk7CisgICAgc3RhdGljIFJlZlB0cjxDU1NWYWx1ZT4g bWF5YmVQYXJzZVZhbHVlKENTU1Byb3BlcnR5SUQsIGNvbnN0IFN0cmluZyYsIENTU1BhcnNlck1v ZGUsIFN0eWxlU2hlZXRDb250ZW50cyopOwogCiAgICAgLy8gUHJvcGVydGllcyBoYW5kbGVkIGhl cmUgc2hvdWxkbid0IGJlIGV4cGxpY2l0bHkgaGFuZGxlZCBpbiBDU1NQcm9wZXJ0eVBhcnNlcgog ICAgIHN0YXRpYyBib29sIGlzS2V5d29yZFByb3BlcnR5SUQoQ1NTUHJvcGVydHlJRCk7Ci0gICAg c3RhdGljIGJvb2wgaXNWYWxpZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKENTU1Byb3BlcnR5SUQs IENTU1ZhbHVlSUQsIENTU1BhcnNlck1vZGUpOworICAgIHN0YXRpYyBib29sIGlzVmFsaWRLZXl3 b3JkUHJvcGVydHlBbmRWYWx1ZShDU1NQcm9wZXJ0eUlELCBDU1NWYWx1ZUlELCBDU1NQYXJzZXJN b2RlLCBTdHlsZVNoZWV0Q29udGVudHMqKTsKIAogICAgIHN0YXRpYyBSZWZQdHI8Q1NTVmFsdWU+ IHBhcnNlQ29sb3IoY29uc3QgU3RyaW5nJiwgQ1NTUGFyc2VyTW9kZSk7CiB9OwpJbmRleDogU291 cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQYXJzZXJJbXBsLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3BwCShyZXZpc2lvbiAyMDkw NzIpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1BhcnNlckltcGwuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC03OTksNyArNzk5LDcgQEAgdm9pZCBDU1NQYXJzZXJJbXBsOjpjb25zdW1l VmFyaWFibGVWYWx1ZQogCiB2b2lkIENTU1BhcnNlckltcGw6OmNvbnN1bWVEZWNsYXJhdGlvblZh bHVlKENTU1BhcnNlclRva2VuUmFuZ2UgcmFuZ2UsIENTU1Byb3BlcnR5SUQgcHJvcGVydHlJRCwg Ym9vbCBpbXBvcnRhbnQsIFN0eWxlUnVsZTo6VHlwZSBydWxlVHlwZSkKIHsKLSAgICBDU1NQcm9w ZXJ0eVBhcnNlcjo6cGFyc2VWYWx1ZShwcm9wZXJ0eUlELCBpbXBvcnRhbnQsIHJhbmdlLCBtX2Nv bnRleHQsIG1fcGFyc2VkUHJvcGVydGllcywgcnVsZVR5cGUpOworICAgIENTU1Byb3BlcnR5UGFy c2VyOjpwYXJzZVZhbHVlKHByb3BlcnR5SUQsIGltcG9ydGFudCwgcmFuZ2UsIG1fY29udGV4dCwg bV9zdHlsZVNoZWV0LmdldCgpLCBtX3BhcnNlZFByb3BlcnRpZXMsIHJ1bGVUeXBlKTsKIH0KIAog c3RkOjp1bmlxdWVfcHRyPFZlY3Rvcjxkb3VibGU+PiBDU1NQYXJzZXJJbXBsOjpjb25zdW1lS2V5 ZnJhbWVLZXlMaXN0KENTU1BhcnNlclRva2VuUmFuZ2UgcmFuZ2UpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViQ29yZS9jc3MvcGFyc2VyL0NTU1Byb3BlcnR5UGFyc2VyLmNwcAkocmV2aXNpb24gMjA5 MjU4KQorKysgU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTIwOCwxMCArMjA4LDEwIEBAIENTU1Byb3BlcnR5SUQgY3NzUHJv cGVydHlJRChTdHJpbmdWaWV3IHMKICAgICAKIHVzaW5nIG5hbWVzcGFjZSBDU1NQcm9wZXJ0eVBh cnNlckhlbHBlcnM7CiAKLUNTU1Byb3BlcnR5UGFyc2VyOjpDU1NQcm9wZXJ0eVBhcnNlcihjb25z dCBDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwKLSAgICBjb25zdCBDU1NQYXJzZXJDb250ZXh0 JiBjb250ZXh0LCBWZWN0b3I8Q1NTUHJvcGVydHksIDI1Nj4qIHBhcnNlZFByb3BlcnRpZXMpCitD U1NQcm9wZXJ0eVBhcnNlcjo6Q1NTUHJvcGVydHlQYXJzZXIoY29uc3QgQ1NTUGFyc2VyVG9rZW5S YW5nZSYgcmFuZ2UsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGNvbnRleHQsIFN0eWxlU2hlZXRD b250ZW50cyogc3R5bGVTaGVldENvbnRlbnRzLCBWZWN0b3I8Q1NTUHJvcGVydHksIDI1Nj4qIHBh cnNlZFByb3BlcnRpZXMpCiAgICAgOiBtX3JhbmdlKHJhbmdlKQogICAgICwgbV9jb250ZXh0KGNv bnRleHQpCisgICAgLCBtX3N0eWxlU2hlZXRDb250ZW50cyhzdHlsZVNoZWV0Q29udGVudHMpCiAg ICAgLCBtX3BhcnNlZFByb3BlcnRpZXMocGFyc2VkUHJvcGVydGllcykKIHsKICAgICBtX3Jhbmdl LmNvbnN1bWVXaGl0ZXNwYWNlKCk7CkBAIC0yNDIsMTMgKzI0MiwxMSBAQCB2b2lkIENTU1Byb3Bl cnR5UGFyc2VyOjphZGRFeHBhbmRlZFByb3BlCiAgICAgICAgIGFkZFByb3BlcnR5KGxvbmdoYW5k c1tpXSwgcHJvcGVydHksIHZhbHVlLmNvcHlSZWYoKSwgaW1wb3J0YW50KTsKIH0KICAgICAKLWJv b2wgQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eUlE LCBib29sIGltcG9ydGFudCwKLSAgICBjb25zdCBDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwg Y29uc3QgQ1NTUGFyc2VyQ29udGV4dCYgY29udGV4dCwKLSAgICBQYXJzZWRQcm9wZXJ0eVZlY3Rv ciYgcGFyc2VkUHJvcGVydGllcywgU3R5bGVSdWxlOjpUeXBlIHJ1bGVUeXBlKQorYm9vbCBDU1NQ cm9wZXJ0eVBhcnNlcjo6cGFyc2VWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5SUQsIGJvb2wg aW1wb3J0YW50LCBjb25zdCBDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgY29uc3QgQ1NTUGFy c2VyQ29udGV4dCYgY29udGV4dCwgU3R5bGVTaGVldENvbnRlbnRzKiBzdHlsZVNoZWV0Q29udGVu dHMsIFBhcnNlZFByb3BlcnR5VmVjdG9yJiBwYXJzZWRQcm9wZXJ0aWVzLCBTdHlsZVJ1bGU6OlR5 cGUgcnVsZVR5cGUpCiB7CiAgICAgaW50IHBhcnNlZFByb3BlcnRpZXNTaXplID0gcGFyc2VkUHJv cGVydGllcy5zaXplKCk7CiAKLSAgICBDU1NQcm9wZXJ0eVBhcnNlciBwYXJzZXIocmFuZ2UsIGNv bnRleHQsICZwYXJzZWRQcm9wZXJ0aWVzKTsKKyAgICBDU1NQcm9wZXJ0eVBhcnNlciBwYXJzZXIo cmFuZ2UsIGNvbnRleHQsIHN0eWxlU2hlZXRDb250ZW50cywgJnBhcnNlZFByb3BlcnRpZXMpOwog ICAgIGJvb2wgcGFyc2VTdWNjZXNzOwogCiAjaWYgRU5BQkxFKENTU19ERVZJQ0VfQURBUFRBVElP TikKQEAgLTI2Nyw5ICsyNjUsOSBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpwYXJzZVZhbHVl KENTU1ByCiAgICAgcmV0dXJuIHBhcnNlU3VjY2VzczsKIH0KIAotUmVmUHRyPENTU1ZhbHVlPiBD U1NQcm9wZXJ0eVBhcnNlcjo6cGFyc2VTaW5nbGVWYWx1ZShDU1NQcm9wZXJ0eUlEIHByb3BlcnR5 LCBjb25zdCBDU1NQYXJzZXJUb2tlblJhbmdlJiByYW5nZSwgY29uc3QgQ1NTUGFyc2VyQ29udGV4 dCYgY29udGV4dCkKK1JlZlB0cjxDU1NWYWx1ZT4gQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlU2lu Z2xlVmFsdWUoQ1NTUHJvcGVydHlJRCBwcm9wZXJ0eSwgY29uc3QgQ1NTUGFyc2VyVG9rZW5SYW5n ZSYgcmFuZ2UsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmIGNvbnRleHQsIFN0eWxlU2hlZXRDb250 ZW50cyogc3R5bGVTaGVldENvbnRlbnRzKQogewotICAgIENTU1Byb3BlcnR5UGFyc2VyIHBhcnNl cihyYW5nZSwgY29udGV4dCwgbnVsbHB0cik7CisgICAgQ1NTUHJvcGVydHlQYXJzZXIgcGFyc2Vy KHJhbmdlLCBjb250ZXh0LCBzdHlsZVNoZWV0Q29udGVudHMsIG51bGxwdHIpOwogICAgIFJlZlB0 cjxDU1NWYWx1ZT4gdmFsdWUgPSBwYXJzZXIucGFyc2VTaW5nbGVWYWx1ZShwcm9wZXJ0eSk7CiAg ICAgaWYgKCF2YWx1ZSB8fCAhcGFyc2VyLm1fcmFuZ2UuYXRFbmQoKSkKICAgICAgICAgcmV0dXJu IG51bGxwdHI7CkBAIC0zNTk3LDcgKzM1OTUsNyBAQCBzdGF0aWMgUmVmUHRyPENTU1ZhbHVlPiBj b25zdW1lVGV4dEVtcGhhCiBSZWZQdHI8Q1NTVmFsdWU+IENTU1Byb3BlcnR5UGFyc2VyOjpwYXJz ZVNpbmdsZVZhbHVlKENTU1Byb3BlcnR5SUQgcHJvcGVydHksIENTU1Byb3BlcnR5SUQgY3VycmVu dFNob3J0aGFuZCkKIHsKICAgICBpZiAoQ1NTUGFyc2VyRmFzdFBhdGhzOjppc0tleXdvcmRQcm9w ZXJ0eUlEKHByb3BlcnR5KSkgewotICAgICAgICBpZiAoIUNTU1BhcnNlckZhc3RQYXRoczo6aXNW YWxpZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKHByb3BlcnR5LCBtX3JhbmdlLnBlZWsoKS5pZCgp LCBtX2NvbnRleHQubW9kZSkpCisgICAgICAgIGlmICghQ1NTUGFyc2VyRmFzdFBhdGhzOjppc1Zh bGlkS2V5d29yZFByb3BlcnR5QW5kVmFsdWUocHJvcGVydHksIG1fcmFuZ2UucGVlaygpLmlkKCks IG1fY29udGV4dC5tb2RlLCBtX3N0eWxlU2hlZXRDb250ZW50cykpCiAgICAgICAgICAgICByZXR1 cm4gbnVsbHB0cjsKICAgICAgICAgcmV0dXJuIGNvbnN1bWVJZGVudChtX3JhbmdlKTsKICAgICB9 CkBAIC00MTM1LDcgKzQxMzMsNyBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpwYXJzZUZvbnRG YWNlRGVzCiAgICAgY2FzZSBDU1NQcm9wZXJ0eUZvbnRTdHJldGNoOgogICAgIGNhc2UgQ1NTUHJv cGVydHlGb250U3R5bGU6IHsKICAgICAgICAgQ1NTVmFsdWVJRCBpZCA9IG1fcmFuZ2UuY29uc3Vt ZUluY2x1ZGluZ1doaXRlc3BhY2UoKS5pZCgpOwotICAgICAgICBpZiAoIUNTU1BhcnNlckZhc3RQ YXRoczo6aXNWYWxpZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKHByb3BJZCwgaWQsIG1fY29udGV4 dC5tb2RlKSkKKyAgICAgICAgaWYgKCFDU1NQYXJzZXJGYXN0UGF0aHM6OmlzVmFsaWRLZXl3b3Jk UHJvcGVydHlBbmRWYWx1ZShwcm9wSWQsIGlkLCBtX2NvbnRleHQubW9kZSwgbV9zdHlsZVNoZWV0 Q29udGVudHMpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICBwYXJzZWRWYWx1 ZSA9IENTU1ZhbHVlUG9vbDo6c2luZ2xldG9uKCkuY3JlYXRlSWRlbnRpZmllclZhbHVlKGlkKTsK ICAgICAgICAgYnJlYWs7CkBAIC00MjE5LDcgKzQyMTcsNyBAQCBib29sIENTU1Byb3BlcnR5UGFy c2VyOjpjb25zdW1lRm9udChib29sCiAgICAgLy8gRklYTUUtTkVXUEFSU0VSOiBJbXBsZW1lbnQu IFJlZlB0cjxDU1NQcmltaXRpdmVWYWx1ZT4gZm9udFN0cmV0Y2g7CiAgICAgd2hpbGUgKCFtX3Jh bmdlLmF0RW5kKCkpIHsKICAgICAgICAgQ1NTVmFsdWVJRCBpZCA9IG1fcmFuZ2UucGVlaygpLmlk KCk7Ci0gICAgICAgIGlmICghZm9udFN0eWxlICYmIENTU1BhcnNlckZhc3RQYXRoczo6aXNWYWxp ZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKENTU1Byb3BlcnR5Rm9udFN0eWxlLCBpZCwgbV9jb250 ZXh0Lm1vZGUpKSB7CisgICAgICAgIGlmICghZm9udFN0eWxlICYmIENTU1BhcnNlckZhc3RQYXRo czo6aXNWYWxpZEtleXdvcmRQcm9wZXJ0eUFuZFZhbHVlKENTU1Byb3BlcnR5Rm9udFN0eWxlLCBp ZCwgbV9jb250ZXh0Lm1vZGUsIG1fc3R5bGVTaGVldENvbnRlbnRzKSkgewogICAgICAgICAgICAg Zm9udFN0eWxlID0gY29uc3VtZUlkZW50KG1fcmFuZ2UpOwogICAgICAgICAgICAgY29udGludWU7 CiAgICAgICAgIH0KQEAgLTQyMzYsNyArNDIzNCw3IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6 OmNvbnN1bWVGb250KGJvb2wKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQog ICAgICAgICAvKiBGSVhNRS1ORVdQQVJTRVI6IEltcGxlbWVudAotICAgICAgICAgaWYgKCFmb250 U3RyZXRjaCAmJiBDU1NQYXJzZXJGYXN0UGF0aHM6OmlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRW YWx1ZShDU1NQcm9wZXJ0eUZvbnRTdHJldGNoLCBpZCwgbV9jb250ZXh0Lm1vZGUpKQorICAgICAg ICAgaWYgKCFmb250U3RyZXRjaCAmJiBDU1NQYXJzZXJGYXN0UGF0aHM6OmlzVmFsaWRLZXl3b3Jk UHJvcGVydHlBbmRWYWx1ZShDU1NQcm9wZXJ0eUZvbnRTdHJldGNoLCBpZCwgbV9jb250ZXh0Lm1v ZGUsIG1fc3R5bGVTaGVldENvbnRlbnRzKSkKICAgICAgICAgICAgIGZvbnRTdHJldGNoID0gY29u c3VtZUlkZW50KG1fcmFuZ2UpOwogICAgICAgICBlbHNlKi8KICAgICAgICAgYnJlYWs7CkBAIC01 MjI2LDcgKzUyMjQsNyBAQCBib29sIENTU1Byb3BlcnR5UGFyc2VyOjpwYXJzZVNob3J0aGFuZChD CiAgICAgc3dpdGNoIChwcm9wZXJ0eSkgewogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRNYXJn aW5Db2xsYXBzZTogewogICAgICAgICBDU1NWYWx1ZUlEIGlkID0gbV9yYW5nZS5jb25zdW1lSW5j bHVkaW5nV2hpdGVzcGFjZSgpLmlkKCk7Ci0gICAgICAgIGlmICghQ1NTUGFyc2VyRmFzdFBhdGhz Ojppc1ZhbGlkS2V5d29yZFByb3BlcnR5QW5kVmFsdWUoQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5C ZWZvcmVDb2xsYXBzZSwgaWQsIG1fY29udGV4dC5tb2RlKSkKKyAgICAgICAgaWYgKCFDU1NQYXJz ZXJGYXN0UGF0aHM6OmlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRWYWx1ZShDU1NQcm9wZXJ0eVdl YmtpdE1hcmdpbkJlZm9yZUNvbGxhcHNlLCBpZCwgbV9jb250ZXh0Lm1vZGUsIG1fc3R5bGVTaGVl dENvbnRlbnRzKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgYWRkUHJvcGVy dHkoQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5CZWZvcmVDb2xsYXBzZSwgQ1NTUHJvcGVydHlXZWJr aXRNYXJnaW5Db2xsYXBzZSwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0b24oKS5jcmVhdGVJZGVudGlm aWVyVmFsdWUoaWQpLCBpbXBvcnRhbnQpOwogICAgICAgICBpZiAobV9yYW5nZS5hdEVuZCgpKSB7 CkBAIC01MjM0LDE0ICs1MjMyLDE0IEBAIGJvb2wgQ1NTUHJvcGVydHlQYXJzZXI6OnBhcnNlU2hv cnRoYW5kKEMKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICB9CiAgICAgICAgIGlk ID0gbV9yYW5nZS5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpLmlkKCk7Ci0gICAgICAgIGlm ICghQ1NTUGFyc2VyRmFzdFBhdGhzOjppc1ZhbGlkS2V5d29yZFByb3BlcnR5QW5kVmFsdWUoQ1NT UHJvcGVydHlXZWJraXRNYXJnaW5BZnRlckNvbGxhcHNlLCBpZCwgbV9jb250ZXh0Lm1vZGUpKQor ICAgICAgICBpZiAoIUNTU1BhcnNlckZhc3RQYXRoczo6aXNWYWxpZEtleXdvcmRQcm9wZXJ0eUFu ZFZhbHVlKENTU1Byb3BlcnR5V2Via2l0TWFyZ2luQWZ0ZXJDb2xsYXBzZSwgaWQsIG1fY29udGV4 dC5tb2RlLCBtX3N0eWxlU2hlZXRDb250ZW50cykpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7 CiAgICAgICAgIGFkZFByb3BlcnR5KENTU1Byb3BlcnR5V2Via2l0TWFyZ2luQWZ0ZXJDb2xsYXBz ZSwgQ1NTUHJvcGVydHlXZWJraXRNYXJnaW5Db2xsYXBzZSwgQ1NTVmFsdWVQb29sOjpzaW5nbGV0 b24oKS5jcmVhdGVJZGVudGlmaWVyVmFsdWUoaWQpLCBpbXBvcnRhbnQpOwogICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICB9CiAgICAgY2FzZSBDU1NQcm9wZXJ0eU92ZXJmbG93OiB7CiAgICAgICAg IENTU1ZhbHVlSUQgaWQgPSBtX3JhbmdlLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNwYWNlKCkuaWQo KTsKLSAgICAgICAgaWYgKCFDU1NQYXJzZXJGYXN0UGF0aHM6OmlzVmFsaWRLZXl3b3JkUHJvcGVy dHlBbmRWYWx1ZShDU1NQcm9wZXJ0eU92ZXJmbG93WSwgaWQsIG1fY29udGV4dC5tb2RlKSkKKyAg ICAgICAgaWYgKCFDU1NQYXJzZXJGYXN0UGF0aHM6OmlzVmFsaWRLZXl3b3JkUHJvcGVydHlBbmRW YWx1ZShDU1NQcm9wZXJ0eU92ZXJmbG93WSwgaWQsIG1fY29udGV4dC5tb2RlLCBtX3N0eWxlU2hl ZXRDb250ZW50cykpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAgIGlmICghbV9y YW5nZS5hdEVuZCgpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpJbmRleDogU291cmNlL1dl YkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2Nzcy9wYXJzZXIvQ1NTUHJvcGVydHlQYXJzZXIuaAkocmV2aXNpb24gMjA4OTk5 KQorKysgU291cmNlL1dlYkNvcmUvY3NzL3BhcnNlci9DU1NQcm9wZXJ0eVBhcnNlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zMSw3ICszMSw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIENT U1Byb3BlcnR5OwogY2xhc3MgQ1NTVmFsdWU7CiBjbGFzcyBTdHlsZVByb3BlcnR5U2hvcnRoYW5k OwotCitjbGFzcyBTdHlsZVNoZWV0Q29udGVudHM7CisgICAgCiAvLyBJbnB1dHM6IFByb3BlcnR5 SUQsIGlzSW1wb3J0YW50IGJvb2wsIENTU1BhcnNlclRva2VuUmFuZ2UuCiAvLyBPdXRwdXRzOiBW ZWN0b3Igb2YgQ1NTUHJvcGVydGllcwogCkBAIC0zOSwxNSArNDAsMTQgQEAgY2xhc3MgQ1NTUHJv cGVydHlQYXJzZXIgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKENTU1Byb3BlcnR5UGFyc2Vy KTsKIHB1YmxpYzoKICAgICBzdGF0aWMgYm9vbCBwYXJzZVZhbHVlKENTU1Byb3BlcnR5SUQsIGJv b2wgaW1wb3J0YW50LAotICAgICAgICBjb25zdCBDU1NQYXJzZXJUb2tlblJhbmdlJiwgY29uc3Qg Q1NTUGFyc2VyQ29udGV4dCYsCisgICAgICAgIGNvbnN0IENTU1BhcnNlclRva2VuUmFuZ2UmLCBj b25zdCBDU1NQYXJzZXJDb250ZXh0JiwgU3R5bGVTaGVldENvbnRlbnRzKiwKICAgICAgICAgVmVj dG9yPENTU1Byb3BlcnR5LCAyNTY+JiwgU3R5bGVSdWxlOjpUeXBlKTsKIAogICAgIC8vIFBhcnNl cyBhIG5vbi1zaG9ydGhhbmQgQ1NTIHByb3BlcnR5Ci0gICAgc3RhdGljIFJlZlB0cjxDU1NWYWx1 ZT4gcGFyc2VTaW5nbGVWYWx1ZShDU1NQcm9wZXJ0eUlELCBjb25zdCBDU1NQYXJzZXJUb2tlblJh bmdlJiwgY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYpOworICAgIHN0YXRpYyBSZWZQdHI8Q1NTVmFs dWU+IHBhcnNlU2luZ2xlVmFsdWUoQ1NTUHJvcGVydHlJRCwgY29uc3QgQ1NTUGFyc2VyVG9rZW5S YW5nZSYsIGNvbnN0IENTU1BhcnNlckNvbnRleHQmLCBTdHlsZVNoZWV0Q29udGVudHMqKTsKIAog cHJpdmF0ZToKLSAgICBDU1NQcm9wZXJ0eVBhcnNlcihjb25zdCBDU1NQYXJzZXJUb2tlblJhbmdl JiwgY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYsCi0gICAgICAgIFZlY3RvcjxDU1NQcm9wZXJ0eSwg MjU2PiopOworICAgIENTU1Byb3BlcnR5UGFyc2VyKGNvbnN0IENTU1BhcnNlclRva2VuUmFuZ2Um LCBjb25zdCBDU1NQYXJzZXJDb250ZXh0JiwgU3R5bGVTaGVldENvbnRlbnRzKiwgVmVjdG9yPENT U1Byb3BlcnR5LCAyNTY+Kik7CiAKICAgICAvLyBGSVhNRTogUmVuYW1lIG9uY2UgdGhlIENTU1Bh cnNlclZhbHVlLWJhc2VkIHBhcnNlVmFsdWUgaXMgcmVtb3ZlZAogICAgIGJvb2wgcGFyc2VWYWx1 ZVN0YXJ0KENTU1Byb3BlcnR5SUQsIGJvb2wgaW1wb3J0YW50KTsKQEAgLTEwMCw2ICsxMDAsOCBA QCBwcml2YXRlOgogICAgIC8vIElucHV0czoKICAgICBDU1NQYXJzZXJUb2tlblJhbmdlIG1fcmFu Z2U7CiAgICAgY29uc3QgQ1NTUGFyc2VyQ29udGV4dCYgbV9jb250ZXh0OworICAgIFN0eWxlU2hl ZXRDb250ZW50cyogbV9zdHlsZVNoZWV0Q29udGVudHM7CisKICAgICAvLyBPdXRwdXRzOgogICAg IFZlY3RvcjxDU1NQcm9wZXJ0eSwgMjU2PiogbV9wYXJzZWRQcm9wZXJ0aWVzOwogfTsK