29888 2009-09-29 10:45:41 -0700 [V8] XMLHttpRequest attribute event listeners are always created as object listeners. 2009-09-29 12:27:44 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 dglazkov dglazkov vitalyr oldest_to_newest 150953 0 dglazkov 2009-09-29 10:45:41 -0700 The recent event listener refactoring revealed a bug, where we never explicitly say if an event listener is attribute for XHR. This leads to attribute listeners always created as object listeners, and thus never being cleared when setting new attribute listener. Bad. 150965 1 40312 dglazkov 2009-09-29 11:08:49 -0700 Created attachment 40312 Fix attribute event listeners in XHR, v1. WebCore/ChangeLog | 14 ++++++++++++ .../bindings/v8/custom/V8XMLHttpRequestCustom.cpp | 22 ++++++++++---------- 2 files changed, 25 insertions(+), 11 deletions(-) 150971 2 vitalyr 2009-09-29 11:18:28 -0700 (In reply to comment #1) > Created an attachment (id=40312) [details] > Fix attribute event listeners in XHR, v1. > > WebCore/ChangeLog | 14 ++++++++++++ > .../bindings/v8/custom/V8XMLHttpRequestCustom.cpp | 22 ++++++++++---------- > 2 files changed, 25 insertions(+), 11 deletions(-) LGTM. 150979 3 40314 dglazkov 2009-09-29 11:47:10 -0700 Created attachment 40314 Fix attribute event listeners in XHR, v2. WebCore/ChangeLog | 14 +++++++++++ .../bindings/v8/custom/V8XMLHttpRequestCustom.cpp | 25 +++++++++++-------- 2 files changed, 28 insertions(+), 11 deletions(-) 150981 4 dglazkov 2009-09-29 11:47:45 -0700 bools == ew. Used enums instead. 150982 5 vitalyr 2009-09-29 11:51:06 -0700 (In reply to comment #4) > bools == ew. Used enums instead. Enum names are misleading here since V8ObjectEventListener can be an attribute listener. 150999 6 dglazkov 2009-09-29 12:27:44 -0700 Landed as http://trac.webkit.org/changeset/48889. 40312 2009-09-29 11:08:49 -0700 2009-09-29 11:46:53 -0700 Fix attribute event listeners in XHR, v1. Fix-attribute-event-listeners-in-XHR-v1..patch text/plain 6587 dglazkov OWQxNmYwNWMxOWE2M2I3MTQ5MjU4NDBjZjY4MzY0ZTJkMTg2MzVmNQpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YjhmZTkxLi4wODRmNTVl IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDA5LTA5LTI5ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW1Y4XSBDb3JyZWN0IGFuIGlzc3VlIHdpdGggWE1MSHR0cFJlcXVlc3QgYXR0cmlidXRl IGV2ZW50IGxpc3RlbmVycyBuZXZlciBiZWluZyBjbGVhcmVkLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk4ODgKKworICAgICAgICBUZXN0OiBMYXlv dXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1ZXN0LWFib3J0LXJl YWR5U3RhdGUtc2hvdWxkRGlzcGF0Y2hFdmVudC5odG1sCisKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9jdXN0b20vVjhYTUxIdHRwUmVxdWVzdEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpn ZXRFdmVudExpc3RlbmVyKTogQWRkZWQgaXNBdHRyaWJ1dGUgcGFyYW1ldGVyLgorICAgICAgICAo V2ViQ29yZTo6QUNDRVNTT1JfU0VUVEVSKTogTWFkZSBhbGwgZXZlbnQgbGlzdGVuZXIgc2V0dGVy cyBjcmVhdGUgYXR0cmlidXRlIGxpc3RlbmVycy4KKyAgICAgICAgKFdlYkNvcmU6OkNBTExCQUNL X0ZVTkNfREVDTCk6IE1hZGUgYWRkRXZlbnRMaXN0ZW5lciBjcmVhdGUgb2JqZWN0IGxpc3RlbmVy LgorCiAyMDA5LTA5LTI4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEJyYWR5IEVpZHNvbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhYTUxIdHRwUmVxdWVzdEN1c3RvbS5jcHAKaW5kZXggOGYyMzY2Yi4u ZjIxMmFjZCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhYTUxIdHRw UmVxdWVzdEN1c3RvbS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhYTUxI dHRwUmVxdWVzdEN1c3RvbS5jcHAKQEAgLTQ1LDE4ICs0NSwxOCBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKLXN0YXRpYyBQYXNzUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGdldEV2ZW50TGlzdGVu ZXIoWE1MSHR0cFJlcXVlc3QqIHhtbEh0dHBSZXF1ZXN0LCB2ODo6TG9jYWw8djg6OlZhbHVlPiB2 YWx1ZSwgYm9vbCBmaW5kT25seSkKK3N0YXRpYyBQYXNzUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGdl dEV2ZW50TGlzdGVuZXIoWE1MSHR0cFJlcXVlc3QqIHhtbEh0dHBSZXF1ZXN0LCB2ODo6TG9jYWw8 djg6OlZhbHVlPiB2YWx1ZSwgYm9vbCBpc0F0dHJpYnV0ZSwgYm9vbCBmaW5kT25seSkKIHsKICNp ZiBFTkFCTEUoV09SS0VSUykKICAgICBXb3JrZXJDb250ZXh0RXhlY3V0aW9uUHJveHkqIHdvcmtl ckNvbnRleHRQcm94eSA9IFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eTo6cmV0cmlldmUoKTsK ICAgICBpZiAod29ya2VyQ29udGV4dFByb3h5KQotICAgICAgICByZXR1cm4gd29ya2VyQ29udGV4 dFByb3h5LT5maW5kT3JDcmVhdGVPYmplY3RFdmVudExpc3RlbmVyKHZhbHVlLCBmYWxzZSwgZmlu ZE9ubHkpOworICAgICAgICByZXR1cm4gd29ya2VyQ29udGV4dFByb3h5LT5maW5kT3JDcmVhdGVP YmplY3RFdmVudExpc3RlbmVyKHZhbHVlLCBpc0F0dHJpYnV0ZSwgZmluZE9ubHkpOwogI2VuZGlm CiAKICAgICBWOFByb3h5KiBwcm94eSA9IFY4UHJveHk6OnJldHJpZXZlKHhtbEh0dHBSZXF1ZXN0 LT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOwogICAgIGlmIChwcm94eSkgewogICAgICAgICBW OEV2ZW50TGlzdGVuZXJMaXN0KiBsaXN0ID0gcHJveHktPm9iamVjdExpc3RlbmVycygpOwotICAg ICAgICByZXR1cm4gZmluZE9ubHkgPyBsaXN0LT5maW5kV3JhcHBlcih2YWx1ZSwgZmFsc2UpIDog bGlzdC0+ZmluZE9yQ3JlYXRlV3JhcHBlcjxWOE9iamVjdEV2ZW50TGlzdGVuZXI+KHByb3h5LT5m cmFtZSgpLCB2YWx1ZSwgZmFsc2UpOworICAgICAgICByZXR1cm4gZmluZE9ubHkgPyBsaXN0LT5m aW5kV3JhcHBlcih2YWx1ZSwgaXNBdHRyaWJ1dGUpIDogbGlzdC0+ZmluZE9yQ3JlYXRlV3JhcHBl cjxWOE9iamVjdEV2ZW50TGlzdGVuZXI+KHByb3h5LT5mcmFtZSgpLCB2YWx1ZSwgaXNBdHRyaWJ1 dGUpOwogICAgIH0KIAogICAgIHJldHVybiBQYXNzUmVmUHRyPEV2ZW50TGlzdGVuZXI+KCk7CkBA IC04OCw3ICs4OCw3IEBAIEFDQ0VTU09SX1NFVFRFUihYTUxIdHRwUmVxdWVzdE9uYWJvcnQpCiAg ICAgICAgIC8vIENsZWFyIHRoZSBsaXN0ZW5lci4KICAgICAgICAgeG1sSHR0cFJlcXVlc3QtPnNl dE9uYWJvcnQoMCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+ IGxpc3RlbmVyID0gZ2V0RXZlbnRMaXN0ZW5lcih4bWxIdHRwUmVxdWVzdCwgdmFsdWUsIGZhbHNl KTsKKyAgICAgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxpc3RlbmVyID0gZ2V0RXZlbnRMaXN0 ZW5lcih4bWxIdHRwUmVxdWVzdCwgdmFsdWUsIHRydWUsIGZhbHNlKTsKICAgICAgICAgaWYgKGxp c3RlbmVyKSB7CiAgICAgICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2V0T25hYm9ydChsaXN0ZW5l cik7CiAgICAgICAgICAgICBjcmVhdGVIaWRkZW5EZXBlbmRlbmN5KGluZm8uSG9sZGVyKCksIHZh bHVlLCBWOEN1c3RvbTo6a1hNTEh0dHBSZXF1ZXN0Q2FjaGVJbmRleCk7CkBAIC0xMjIsNyArMTIy LDcgQEAgQUNDRVNTT1JfU0VUVEVSKFhNTEh0dHBSZXF1ZXN0T25lcnJvcikKICAgICAgICAgLy8g Q2xlYXIgdGhlIGxpc3RlbmVyLgogICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2V0T25lcnJvcigw KTsKICAgICB9IGVsc2UgewotICAgICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIg PSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwgZmFsc2UpOworICAgICAg ICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0 dHBSZXF1ZXN0LCB2YWx1ZSwgdHJ1ZSwgZmFsc2UpOwogICAgICAgICBpZiAobGlzdGVuZXIpIHsK ICAgICAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5zZXRPbmVycm9yKGxpc3RlbmVyKTsKICAgICAg ICAgICAgIGNyZWF0ZUhpZGRlbkRlcGVuZGVuY3koaW5mby5Ib2xkZXIoKSwgdmFsdWUsIFY4Q3Vz dG9tOjprWE1MSHR0cFJlcXVlc3RDYWNoZUluZGV4KTsKQEAgLTE1Niw3ICsxNTYsNyBAQCBBQ0NF U1NPUl9TRVRURVIoWE1MSHR0cFJlcXVlc3RPbmxvYWQpCiAgICAgICAgIHhtbEh0dHBSZXF1ZXN0 LT5zZXRPbmxvYWQoMCk7CiAKICAgICB9IGVsc2UgewotICAgICAgICBSZWZQdHI8RXZlbnRMaXN0 ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwg ZmFsc2UpOworICAgICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVu dExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwgdHJ1ZSwgZmFsc2UpOwogICAgICAgICBp ZiAobGlzdGVuZXIpIHsKICAgICAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5zZXRPbmxvYWQobGlz dGVuZXIuZ2V0KCkpOwogICAgICAgICAgICAgY3JlYXRlSGlkZGVuRGVwZW5kZW5jeShpbmZvLkhv bGRlcigpLCB2YWx1ZSwgVjhDdXN0b206OmtYTUxIdHRwUmVxdWVzdENhY2hlSW5kZXgpOwpAQCAt MTkwLDcgKzE5MCw3IEBAIEFDQ0VTU09SX1NFVFRFUihYTUxIdHRwUmVxdWVzdE9ubG9hZHN0YXJ0 KQogICAgICAgICAvLyBDbGVhciB0aGUgbGlzdGVuZXIuCiAgICAgICAgIHhtbEh0dHBSZXF1ZXN0 LT5zZXRPbmxvYWRzdGFydCgwKTsKICAgICB9IGVsc2UgewotICAgICAgICBSZWZQdHI8RXZlbnRM aXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1 ZSwgZmFsc2UpOworICAgICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRF dmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwgdHJ1ZSwgZmFsc2UpOwogICAgICAg ICBpZiAobGlzdGVuZXIpIHsKICAgICAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5zZXRPbmxvYWRz dGFydChsaXN0ZW5lcik7CiAgICAgICAgICAgICBjcmVhdGVIaWRkZW5EZXBlbmRlbmN5KGluZm8u SG9sZGVyKCksIHZhbHVlLCBWOEN1c3RvbTo6a1hNTEh0dHBSZXF1ZXN0Q2FjaGVJbmRleCk7CkBA IC0yMjQsNyArMjI0LDcgQEAgQUNDRVNTT1JfU0VUVEVSKFhNTEh0dHBSZXF1ZXN0T25wcm9ncmVz cykKICAgICAgICAgLy8gQ2xlYXIgdGhlIGxpc3RlbmVyLgogICAgICAgICB4bWxIdHRwUmVxdWVz dC0+c2V0T25wcm9ncmVzcygwKTsKICAgICB9IGVsc2UgewotICAgICAgICBSZWZQdHI8RXZlbnRM aXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1 ZSwgZmFsc2UpOworICAgICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRF dmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwgdHJ1ZSwgZmFsc2UpOwogICAgICAg ICBpZiAobGlzdGVuZXIpIHsKICAgICAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5zZXRPbnByb2dy ZXNzKGxpc3RlbmVyKTsKICAgICAgICAgICAgIGNyZWF0ZUhpZGRlbkRlcGVuZGVuY3koaW5mby5I b2xkZXIoKSwgdmFsdWUsIFY4Q3VzdG9tOjprWE1MSHR0cFJlcXVlc3RDYWNoZUluZGV4KTsKQEAg LTI1OCw3ICsyNTgsNyBAQCBBQ0NFU1NPUl9TRVRURVIoWE1MSHR0cFJlcXVlc3RPbnJlYWR5c3Rh dGVjaGFuZ2UpCiAgICAgICAgIC8vIENsZWFyIHRoZSBsaXN0ZW5lci4KICAgICAgICAgeG1sSHR0 cFJlcXVlc3QtPnNldE9ucmVhZHlzdGF0ZWNoYW5nZSgwKTsKICAgICB9IGVsc2UgewotICAgICAg ICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0 dHBSZXF1ZXN0LCB2YWx1ZSwgZmFsc2UpOworICAgICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4g bGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwgdHJ1ZSwg ZmFsc2UpOwogICAgICAgICBpZiAobGlzdGVuZXIpIHsKICAgICAgICAgICAgIHhtbEh0dHBSZXF1 ZXN0LT5zZXRPbnJlYWR5c3RhdGVjaGFuZ2UobGlzdGVuZXIuZ2V0KCkpOwogICAgICAgICAgICAg Y3JlYXRlSGlkZGVuRGVwZW5kZW5jeShpbmZvLkhvbGRlcigpLCB2YWx1ZSwgVjhDdXN0b206OmtY TUxIdHRwUmVxdWVzdENhY2hlSW5kZXgpOwpAQCAtMjgwLDcgKzI4MCw3IEBAIENBTExCQUNLX0ZV TkNfREVDTChYTUxIdHRwUmVxdWVzdEFkZEV2ZW50TGlzdGVuZXIpCiAgICAgSU5DX1NUQVRTKCJE T00uWE1MSHR0cFJlcXVlc3QuYWRkRXZlbnRMaXN0ZW5lcigpIik7CiAgICAgWE1MSHR0cFJlcXVl c3QqIHhtbEh0dHBSZXF1ZXN0ID0gVjhET01XcmFwcGVyOjpjb252ZXJ0VG9OYXRpdmVPYmplY3Q8 WE1MSHR0cFJlcXVlc3Q+KFY4Q2xhc3NJbmRleDo6WE1MSFRUUFJFUVVFU1QsIGFyZ3MuSG9sZGVy KCkpOwogCi0gICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxpc3RlbmVyID0gZ2V0RXZlbnRMaXN0 ZW5lcih4bWxIdHRwUmVxdWVzdCwgYXJnc1sxXSwgZmFsc2UpOworICAgIFJlZlB0cjxFdmVudExp c3RlbmVyPiBsaXN0ZW5lciA9IGdldEV2ZW50TGlzdGVuZXIoeG1sSHR0cFJlcXVlc3QsIGFyZ3Nb MV0sIGZhbHNlLCBmYWxzZSk7CiAgICAgaWYgKGxpc3RlbmVyKSB7CiAgICAgICAgIFN0cmluZyB0 eXBlID0gdG9XZWJDb3JlU3RyaW5nKGFyZ3NbMF0pOwogICAgICAgICBib29sIHVzZUNhcHR1cmUg PSBhcmdzWzJdLT5Cb29sZWFuVmFsdWUoKTsKQEAgLTI5Niw3ICsyOTYsNyBAQCBDQUxMQkFDS19G VU5DX0RFQ0woWE1MSHR0cFJlcXVlc3RSZW1vdmVFdmVudExpc3RlbmVyKQogICAgIElOQ19TVEFU UygiRE9NLlhNTEh0dHBSZXF1ZXN0LnJlbW92ZUV2ZW50TGlzdGVuZXIoKSIpOwogICAgIFhNTEh0 dHBSZXF1ZXN0KiB4bWxIdHRwUmVxdWVzdCA9IFY4RE9NV3JhcHBlcjo6Y29udmVydFRvTmF0aXZl T2JqZWN0PFhNTEh0dHBSZXF1ZXN0PihWOENsYXNzSW5kZXg6OlhNTEhUVFBSRVFVRVNULCBhcmdz LkhvbGRlcigpKTsKIAotICAgIFJlZlB0cjxFdmVudExpc3RlbmVyPiBsaXN0ZW5lciA9IGdldEV2 ZW50TGlzdGVuZXIoeG1sSHR0cFJlcXVlc3QsIGFyZ3NbMV0sIHRydWUpOworICAgIFJlZlB0cjxF dmVudExpc3RlbmVyPiBsaXN0ZW5lciA9IGdldEV2ZW50TGlzdGVuZXIoeG1sSHR0cFJlcXVlc3Qs IGFyZ3NbMV0sIGZhbHNlLCB0cnVlKTsKICAgICBpZiAobGlzdGVuZXIpIHsKICAgICAgICAgU3Ry aW5nIHR5cGUgPSB0b1dlYkNvcmVTdHJpbmcoYXJnc1swXSk7CiAgICAgICAgIGJvb2wgdXNlQ2Fw dHVyZSA9IGFyZ3NbMl0tPkJvb2xlYW5WYWx1ZSgpOwo= 40314 2009-09-29 11:47:10 -0700 2009-09-29 11:48:26 -0700 Fix attribute event listeners in XHR, v2. Fix-attribute-event-listeners-in-XHR-v2..patch text/plain 6904 dglazkov YzcwNTJlYTU0MzMyOTU0MTYyN2NiYmQyNDgyZjkyNTEwNmIzN2ZkYwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2YjhmZTkxLi4wODRmNTVl IDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE3IEBACisyMDA5LTA5LTI5ICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW1Y4XSBDb3JyZWN0IGFuIGlzc3VlIHdpdGggWE1MSHR0cFJlcXVlc3QgYXR0cmlidXRl IGV2ZW50IGxpc3RlbmVycyBuZXZlciBiZWluZyBjbGVhcmVkLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk4ODgKKworICAgICAgICBUZXN0OiBMYXlv dXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1ZXN0LWFib3J0LXJl YWR5U3RhdGUtc2hvdWxkRGlzcGF0Y2hFdmVudC5odG1sCisKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9jdXN0b20vVjhYTUxIdHRwUmVxdWVzdEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpn ZXRFdmVudExpc3RlbmVyKTogQWRkZWQgaXNBdHRyaWJ1dGUgcGFyYW1ldGVyLgorICAgICAgICAo V2ViQ29yZTo6QUNDRVNTT1JfU0VUVEVSKTogTWFkZSBhbGwgZXZlbnQgbGlzdGVuZXIgc2V0dGVy cyBjcmVhdGUgYXR0cmlidXRlIGxpc3RlbmVycy4KKyAgICAgICAgKFdlYkNvcmU6OkNBTExCQUNL X0ZVTkNfREVDTCk6IE1hZGUgYWRkRXZlbnRMaXN0ZW5lciBjcmVhdGUgb2JqZWN0IGxpc3RlbmVy LgorCiAyMDA5LTA5LTI4ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEJyYWR5IEVpZHNvbi4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RDdXN0b20uY3BwIGIvV2ViQ29yZS9iaW5k aW5ncy92OC9jdXN0b20vVjhYTUxIdHRwUmVxdWVzdEN1c3RvbS5jcHAKaW5kZXggOGYyMzY2Yi4u NDZjN2E3ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhYTUxIdHRw UmVxdWVzdEN1c3RvbS5jcHAKKysrIGIvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhYTUxI dHRwUmVxdWVzdEN1c3RvbS5jcHAKQEAgLTQ1LDE4ICs0NSwyMSBAQAogCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAKLXN0YXRpYyBQYXNzUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGdldEV2ZW50TGlzdGVu ZXIoWE1MSHR0cFJlcXVlc3QqIHhtbEh0dHBSZXF1ZXN0LCB2ODo6TG9jYWw8djg6OlZhbHVlPiB2 YWx1ZSwgYm9vbCBmaW5kT25seSkKK2VudW0gRXZlbnRMaXN0ZW5lclR5cGUgeyBBdHRyaWJ1dGVF dmVudExpc3RlbmVyVHlwZSwgT2JqZWN0RXZlbnRMaXN0ZW5lclR5cGUgfTsKKworc3RhdGljIFBh c3NSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gZ2V0RXZlbnRMaXN0ZW5lcihYTUxIdHRwUmVxdWVzdCog eG1sSHR0cFJlcXVlc3QsIHY4OjpMb2NhbDx2ODo6VmFsdWU+IHZhbHVlLCBFdmVudExpc3RlbmVy VHlwZSB0eXBlLCBib29sIGZpbmRPbmx5KQogeworICAgIGJvb2wgaXNBdHRyaWJ1dGUgPSB0eXBl ID09IEF0dHJpYnV0ZUV2ZW50TGlzdGVuZXJUeXBlOwogI2lmIEVOQUJMRShXT1JLRVJTKQogICAg IFdvcmtlckNvbnRleHRFeGVjdXRpb25Qcm94eSogd29ya2VyQ29udGV4dFByb3h5ID0gV29ya2Vy Q29udGV4dEV4ZWN1dGlvblByb3h5OjpyZXRyaWV2ZSgpOwogICAgIGlmICh3b3JrZXJDb250ZXh0 UHJveHkpCi0gICAgICAgIHJldHVybiB3b3JrZXJDb250ZXh0UHJveHktPmZpbmRPckNyZWF0ZU9i amVjdEV2ZW50TGlzdGVuZXIodmFsdWUsIGZhbHNlLCBmaW5kT25seSk7CisgICAgICAgIHJldHVy biB3b3JrZXJDb250ZXh0UHJveHktPmZpbmRPckNyZWF0ZU9iamVjdEV2ZW50TGlzdGVuZXIodmFs dWUsIGlzQXR0cmlidXRlLCBmaW5kT25seSk7CiAjZW5kaWYKIAogICAgIFY4UHJveHkqIHByb3h5 ID0gVjhQcm94eTo6cmV0cmlldmUoeG1sSHR0cFJlcXVlc3QtPnNjcmlwdEV4ZWN1dGlvbkNvbnRl eHQoKSk7CiAgICAgaWYgKHByb3h5KSB7CiAgICAgICAgIFY4RXZlbnRMaXN0ZW5lckxpc3QqIGxp c3QgPSBwcm94eS0+b2JqZWN0TGlzdGVuZXJzKCk7Ci0gICAgICAgIHJldHVybiBmaW5kT25seSA/ IGxpc3QtPmZpbmRXcmFwcGVyKHZhbHVlLCBmYWxzZSkgOiBsaXN0LT5maW5kT3JDcmVhdGVXcmFw cGVyPFY4T2JqZWN0RXZlbnRMaXN0ZW5lcj4ocHJveHktPmZyYW1lKCksIHZhbHVlLCBmYWxzZSk7 CisgICAgICAgIHJldHVybiBmaW5kT25seSA/IGxpc3QtPmZpbmRXcmFwcGVyKHZhbHVlLCBpc0F0 dHJpYnV0ZSkgOiBsaXN0LT5maW5kT3JDcmVhdGVXcmFwcGVyPFY4T2JqZWN0RXZlbnRMaXN0ZW5l cj4ocHJveHktPmZyYW1lKCksIHZhbHVlLCBpc0F0dHJpYnV0ZSk7CiAgICAgfQogCiAgICAgcmV0 dXJuIFBhc3NSZWZQdHI8RXZlbnRMaXN0ZW5lcj4oKTsKQEAgLTg4LDcgKzkxLDcgQEAgQUNDRVNT T1JfU0VUVEVSKFhNTEh0dHBSZXF1ZXN0T25hYm9ydCkKICAgICAgICAgLy8gQ2xlYXIgdGhlIGxp c3RlbmVyLgogICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2V0T25hYm9ydCgwKTsKICAgICB9IGVs c2UgewotICAgICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExp c3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwgZmFsc2UpOworICAgICAgICBSZWZQdHI8RXZl bnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2 YWx1ZSwgQXR0cmlidXRlRXZlbnRMaXN0ZW5lclR5cGUsIGZhbHNlKTsKICAgICAgICAgaWYgKGxp c3RlbmVyKSB7CiAgICAgICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2V0T25hYm9ydChsaXN0ZW5l cik7CiAgICAgICAgICAgICBjcmVhdGVIaWRkZW5EZXBlbmRlbmN5KGluZm8uSG9sZGVyKCksIHZh bHVlLCBWOEN1c3RvbTo6a1hNTEh0dHBSZXF1ZXN0Q2FjaGVJbmRleCk7CkBAIC0xMjIsNyArMTI1 LDcgQEAgQUNDRVNTT1JfU0VUVEVSKFhNTEh0dHBSZXF1ZXN0T25lcnJvcikKICAgICAgICAgLy8g Q2xlYXIgdGhlIGxpc3RlbmVyLgogICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2V0T25lcnJvcigw KTsKICAgICB9IGVsc2UgewotICAgICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIg PSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwgZmFsc2UpOworICAgICAg ICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0 dHBSZXF1ZXN0LCB2YWx1ZSwgQXR0cmlidXRlRXZlbnRMaXN0ZW5lclR5cGUsIGZhbHNlKTsKICAg ICAgICAgaWYgKGxpc3RlbmVyKSB7CiAgICAgICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2V0T25l cnJvcihsaXN0ZW5lcik7CiAgICAgICAgICAgICBjcmVhdGVIaWRkZW5EZXBlbmRlbmN5KGluZm8u SG9sZGVyKCksIHZhbHVlLCBWOEN1c3RvbTo6a1hNTEh0dHBSZXF1ZXN0Q2FjaGVJbmRleCk7CkBA IC0xNTYsNyArMTU5LDcgQEAgQUNDRVNTT1JfU0VUVEVSKFhNTEh0dHBSZXF1ZXN0T25sb2FkKQog ICAgICAgICB4bWxIdHRwUmVxdWVzdC0+c2V0T25sb2FkKDApOwogCiAgICAgfSBlbHNlIHsKLSAg ICAgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxpc3RlbmVyID0gZ2V0RXZlbnRMaXN0ZW5lcih4 bWxIdHRwUmVxdWVzdCwgdmFsdWUsIGZhbHNlKTsKKyAgICAgICAgUmVmUHRyPEV2ZW50TGlzdGVu ZXI+IGxpc3RlbmVyID0gZ2V0RXZlbnRMaXN0ZW5lcih4bWxIdHRwUmVxdWVzdCwgdmFsdWUsIEF0 dHJpYnV0ZUV2ZW50TGlzdGVuZXJUeXBlLCBmYWxzZSk7CiAgICAgICAgIGlmIChsaXN0ZW5lcikg ewogICAgICAgICAgICAgeG1sSHR0cFJlcXVlc3QtPnNldE9ubG9hZChsaXN0ZW5lci5nZXQoKSk7 CiAgICAgICAgICAgICBjcmVhdGVIaWRkZW5EZXBlbmRlbmN5KGluZm8uSG9sZGVyKCksIHZhbHVl LCBWOEN1c3RvbTo6a1hNTEh0dHBSZXF1ZXN0Q2FjaGVJbmRleCk7CkBAIC0xOTAsNyArMTkzLDcg QEAgQUNDRVNTT1JfU0VUVEVSKFhNTEh0dHBSZXF1ZXN0T25sb2Fkc3RhcnQpCiAgICAgICAgIC8v IENsZWFyIHRoZSBsaXN0ZW5lci4KICAgICAgICAgeG1sSHR0cFJlcXVlc3QtPnNldE9ubG9hZHN0 YXJ0KDApOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIFJlZlB0cjxFdmVudExpc3RlbmVyPiBsaXN0 ZW5lciA9IGdldEV2ZW50TGlzdGVuZXIoeG1sSHR0cFJlcXVlc3QsIHZhbHVlLCBmYWxzZSk7Cisg ICAgICAgIFJlZlB0cjxFdmVudExpc3RlbmVyPiBsaXN0ZW5lciA9IGdldEV2ZW50TGlzdGVuZXIo eG1sSHR0cFJlcXVlc3QsIHZhbHVlLCBBdHRyaWJ1dGVFdmVudExpc3RlbmVyVHlwZSwgZmFsc2Up OwogICAgICAgICBpZiAobGlzdGVuZXIpIHsKICAgICAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5z ZXRPbmxvYWRzdGFydChsaXN0ZW5lcik7CiAgICAgICAgICAgICBjcmVhdGVIaWRkZW5EZXBlbmRl bmN5KGluZm8uSG9sZGVyKCksIHZhbHVlLCBWOEN1c3RvbTo6a1hNTEh0dHBSZXF1ZXN0Q2FjaGVJ bmRleCk7CkBAIC0yMjQsNyArMjI3LDcgQEAgQUNDRVNTT1JfU0VUVEVSKFhNTEh0dHBSZXF1ZXN0 T25wcm9ncmVzcykKICAgICAgICAgLy8gQ2xlYXIgdGhlIGxpc3RlbmVyLgogICAgICAgICB4bWxI dHRwUmVxdWVzdC0+c2V0T25wcm9ncmVzcygwKTsKICAgICB9IGVsc2UgewotICAgICAgICBSZWZQ dHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1 ZXN0LCB2YWx1ZSwgZmFsc2UpOworICAgICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVu ZXIgPSBnZXRFdmVudExpc3RlbmVyKHhtbEh0dHBSZXF1ZXN0LCB2YWx1ZSwgQXR0cmlidXRlRXZl bnRMaXN0ZW5lclR5cGUsIGZhbHNlKTsKICAgICAgICAgaWYgKGxpc3RlbmVyKSB7CiAgICAgICAg ICAgICB4bWxIdHRwUmVxdWVzdC0+c2V0T25wcm9ncmVzcyhsaXN0ZW5lcik7CiAgICAgICAgICAg ICBjcmVhdGVIaWRkZW5EZXBlbmRlbmN5KGluZm8uSG9sZGVyKCksIHZhbHVlLCBWOEN1c3RvbTo6 a1hNTEh0dHBSZXF1ZXN0Q2FjaGVJbmRleCk7CkBAIC0yNTgsNyArMjYxLDcgQEAgQUNDRVNTT1Jf U0VUVEVSKFhNTEh0dHBSZXF1ZXN0T25yZWFkeXN0YXRlY2hhbmdlKQogICAgICAgICAvLyBDbGVh ciB0aGUgbGlzdGVuZXIuCiAgICAgICAgIHhtbEh0dHBSZXF1ZXN0LT5zZXRPbnJlYWR5c3RhdGVj aGFuZ2UoMCk7CiAgICAgfSBlbHNlIHsKLSAgICAgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxp c3RlbmVyID0gZ2V0RXZlbnRMaXN0ZW5lcih4bWxIdHRwUmVxdWVzdCwgdmFsdWUsIGZhbHNlKTsK KyAgICAgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxpc3RlbmVyID0gZ2V0RXZlbnRMaXN0ZW5l cih4bWxIdHRwUmVxdWVzdCwgdmFsdWUsIEF0dHJpYnV0ZUV2ZW50TGlzdGVuZXJUeXBlLCBmYWxz ZSk7CiAgICAgICAgIGlmIChsaXN0ZW5lcikgewogICAgICAgICAgICAgeG1sSHR0cFJlcXVlc3Qt PnNldE9ucmVhZHlzdGF0ZWNoYW5nZShsaXN0ZW5lci5nZXQoKSk7CiAgICAgICAgICAgICBjcmVh dGVIaWRkZW5EZXBlbmRlbmN5KGluZm8uSG9sZGVyKCksIHZhbHVlLCBWOEN1c3RvbTo6a1hNTEh0 dHBSZXF1ZXN0Q2FjaGVJbmRleCk7CkBAIC0yODAsNyArMjgzLDcgQEAgQ0FMTEJBQ0tfRlVOQ19E RUNMKFhNTEh0dHBSZXF1ZXN0QWRkRXZlbnRMaXN0ZW5lcikKICAgICBJTkNfU1RBVFMoIkRPTS5Y TUxIdHRwUmVxdWVzdC5hZGRFdmVudExpc3RlbmVyKCkiKTsKICAgICBYTUxIdHRwUmVxdWVzdCog eG1sSHR0cFJlcXVlc3QgPSBWOERPTVdyYXBwZXI6OmNvbnZlcnRUb05hdGl2ZU9iamVjdDxYTUxI dHRwUmVxdWVzdD4oVjhDbGFzc0luZGV4OjpYTUxIVFRQUkVRVUVTVCwgYXJncy5Ib2xkZXIoKSk7 CiAKLSAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBnZXRFdmVudExpc3RlbmVy KHhtbEh0dHBSZXF1ZXN0LCBhcmdzWzFdLCBmYWxzZSk7CisgICAgUmVmUHRyPEV2ZW50TGlzdGVu ZXI+IGxpc3RlbmVyID0gZ2V0RXZlbnRMaXN0ZW5lcih4bWxIdHRwUmVxdWVzdCwgYXJnc1sxXSwg T2JqZWN0RXZlbnRMaXN0ZW5lclR5cGUsIGZhbHNlKTsKICAgICBpZiAobGlzdGVuZXIpIHsKICAg ICAgICAgU3RyaW5nIHR5cGUgPSB0b1dlYkNvcmVTdHJpbmcoYXJnc1swXSk7CiAgICAgICAgIGJv b2wgdXNlQ2FwdHVyZSA9IGFyZ3NbMl0tPkJvb2xlYW5WYWx1ZSgpOwpAQCAtMjk2LDcgKzI5OSw3 IEBAIENBTExCQUNLX0ZVTkNfREVDTChYTUxIdHRwUmVxdWVzdFJlbW92ZUV2ZW50TGlzdGVuZXIp CiAgICAgSU5DX1NUQVRTKCJET00uWE1MSHR0cFJlcXVlc3QucmVtb3ZlRXZlbnRMaXN0ZW5lcigp Iik7CiAgICAgWE1MSHR0cFJlcXVlc3QqIHhtbEh0dHBSZXF1ZXN0ID0gVjhET01XcmFwcGVyOjpj b252ZXJ0VG9OYXRpdmVPYmplY3Q8WE1MSHR0cFJlcXVlc3Q+KFY4Q2xhc3NJbmRleDo6WE1MSFRU UFJFUVVFU1QsIGFyZ3MuSG9sZGVyKCkpOwogCi0gICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxp c3RlbmVyID0gZ2V0RXZlbnRMaXN0ZW5lcih4bWxIdHRwUmVxdWVzdCwgYXJnc1sxXSwgdHJ1ZSk7 CisgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxpc3RlbmVyID0gZ2V0RXZlbnRMaXN0ZW5lcih4 bWxIdHRwUmVxdWVzdCwgYXJnc1sxXSwgT2JqZWN0RXZlbnRMaXN0ZW5lclR5cGUsIHRydWUpOwog ICAgIGlmIChsaXN0ZW5lcikgewogICAgICAgICBTdHJpbmcgdHlwZSA9IHRvV2ViQ29yZVN0cmlu ZyhhcmdzWzBdKTsKICAgICAgICAgYm9vbCB1c2VDYXB0dXJlID0gYXJnc1syXS0+Qm9vbGVhblZh bHVlKCk7Cg==