185174 2018-05-01 16:03:29 -0700 JSC should be able to cache custom setter calls on the prototype chain 2018-05-02 11:52:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo fpizlo ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1419456 0 fpizlo 2018-05-01 16:03:29 -0700 Patch forthcoming. 1419458 1 339236 fpizlo 2018-05-01 16:08:59 -0700 Created attachment 339236 the patch 1419766 2 fpizlo 2018-05-02 11:51:34 -0700 Landed in https://trac.webkit.org/changeset/231250/webkit 1419767 3 webkit-bug-importer 2018-05-02 11:52:21 -0700 <rdar://problem/39912941> 339236 2018-05-01 16:08:59 -0700 2018-05-01 16:15:46 -0700 the patch blah.patch text/plain 10903 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjMxMjE1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM3IEBA CisyMDE4LTA1LTAxICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg SlNDIHNob3VsZCBiZSBhYmxlIHRvIGNhY2hlIGN1c3RvbSBzZXR0ZXIgY2FsbHMgb24gdGhlIHBy b3RvdHlwZSBjaGFpbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTg1MTc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2UgYnJva2UgY3VzdG9tLXNldHRlci1vbi10aGUtcHJvdG90eXBlLWNoYWluIGNhY2hp bmcgd2hlbiB3ZSBmaXhlZCBhIGJ1ZyBpbnZvbHZpbmcgdGhlIGNvbmRpdGlvblNldC5pc0VtcHR5 KCkKKyAgICAgICAgY29uZGl0aW9uIGJlaW5nIHVzZWQgdG8gZGV0ZXJtaW5lIGlmIHdlIGhhdmUg YW4gYWx0ZXJuYXRlQmFzZS4gVGhlIGZpeCBpbiByMjIyNjcxIGluY29ycmVjdGx5IHRyaWVkIHRv IGFkZAorICAgICAgICBpbXBvc3NpYmxlLXRvLXZhbGlkYXRlIGNvbmRpdGlvbnMgdG8gdGhlIGNv bmRpdGlvblNldCBieSBjYWxsaW5nIGdlbmVyYXRlQ29uZGl0aW9uc0ZvclByb3RvdHlwZVByb3Bl cnR5SGl0KCkgaW5zdGVhZAorICAgICAgICBvZiBnZW5lcmF0ZUNvbmRpdGlvbnNGb3JQcm90b3R5 cGVQcm9wZXJ0eUhpdEN1c3RvbSgpLiBUaGUgcHJvYmxlbSBpcyB0aGF0IHRoZSBmb3JtZXIgZnVu Y3Rpb24gd2lsbCBhbHdheXMgZmFpbCBmb3IKKyAgICAgICAgY3VzdG9tIGFjY2Vzc29ycyBiZWNh dXNlIGl0IHdvbid0IGZpbmQgdGhlIGN1c3RvbSBwcm9wZXJ0eSBpbiB0aGUgc3RydWN0dXJlLgor CisgICAgICAgIFRoZSBmaXggaXMgdG8gYWRkIGEgdmlydHVhbCBoYXNBbHRlcm5hdGVCYXNlKCkg ZnVuY3Rpb24gYW5kIHVzZSB0aGF0IGluc3RlYWQgb2YgY29uZGl0aW9uU2V0LmlzRW1wdHkoKS4K KworICAgICAgICBUaGlzIGlzIGEgNHggc3BlZWQtdXAgb24gYXNzaWduLWN1c3RvbS1zZXR0ZXIu anMuCisKKyAgICAgICAgKiBieXRlY29kZS9BY2Nlc3NDYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6 QWNjZXNzQ2FzZTo6aGFzQWx0ZXJuYXRlQmFzZSBjb25zdCk6CisgICAgICAgIChKU0M6OkFjY2Vz c0Nhc2U6OmFsdGVybmF0ZUJhc2UgY29uc3QpOgorICAgICAgICAoSlNDOjpBY2Nlc3NDYXNlOjpn ZW5lcmF0ZUltcGwpOgorICAgICAgICAqIGJ5dGVjb2RlL0FjY2Vzc0Nhc2UuaDoKKyAgICAgICAg KEpTQzo6QWNjZXNzQ2FzZTo6YWx0ZXJuYXRlQmFzZSBjb25zdCk6IERlbGV0ZWQuCisgICAgICAg ICogYnl0ZWNvZGUvR2V0dGVyU2V0dGVyQWNjZXNzQ2FzZS5jcHA6CisgICAgICAgIChKU0M6Okdl dHRlclNldHRlckFjY2Vzc0Nhc2U6Omhhc0FsdGVybmF0ZUJhc2UgY29uc3QpOgorICAgICAgICAo SlNDOjpHZXR0ZXJTZXR0ZXJBY2Nlc3NDYXNlOjphbHRlcm5hdGVCYXNlIGNvbnN0KToKKyAgICAg ICAgKiBieXRlY29kZS9HZXR0ZXJTZXR0ZXJBY2Nlc3NDYXNlLmg6CisgICAgICAgICogYnl0ZWNv ZGUvT2JqZWN0UHJvcGVydHlDb25kaXRpb25TZXQuY3BwOgorICAgICAgICAoSlNDOjpnZW5lcmF0 ZUNvbmRpdGlvbnNGb3JQcm90b3R5cGVQcm9wZXJ0eUhpdEN1c3RvbSk6CisgICAgICAgICogYnl0 ZWNvZGUvT2JqZWN0UHJvcGVydHlDb25kaXRpb25TZXQuaDoKKyAgICAgICAgKiBqaXQvUmVwYXRj aC5jcHA6CisgICAgICAgIChKU0M6OnRyeUNhY2hlR2V0QnlJRCk6CisgICAgICAgIChKU0M6OnRy eUNhY2hlUHV0QnlJRCk6CisKIDIwMTgtMDQtMzAgIEZpbGlwIFBpemxvICA8ZnBpemxvQGFwcGxl LmNvbT4KIAogICAgICAgICBCMzo6ZGVtb3RlVmFsdWVzIHNob3VsZCBiZSBhYmxlIHRvIGhhbmRs ZSBwYXRjaHBvaW50IHRlcm1pbmFscwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVj b2RlL0FjY2Vzc0Nhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9BY2Nlc3NDYXNlLmNwcAkocmV2aXNpb24gMjMxMjAxKQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL0FjY2Vzc0Nhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjEs NiArMTIxLDE2IEBAIHN0ZDo6dW5pcXVlX3B0cjxBY2Nlc3NDYXNlPiBBY2Nlc3NDYXNlOjoKICAg ICB9CiB9CiAKK2Jvb2wgQWNjZXNzQ2FzZTo6aGFzQWx0ZXJuYXRlQmFzZSgpIGNvbnN0Cit7Cisg ICAgcmV0dXJuICFjb25kaXRpb25TZXQoKS5pc0VtcHR5KCk7Cit9CisKK0pTT2JqZWN0KiBBY2Nl c3NDYXNlOjphbHRlcm5hdGVCYXNlKCkgY29uc3QKK3sKKyAgICByZXR1cm4gY29uZGl0aW9uU2V0 KCkuc2xvdEJhc2VDb25kaXRpb24oKS5vYmplY3QoKTsKK30KKwogc3RkOjp1bmlxdWVfcHRyPEFj Y2Vzc0Nhc2U+IEFjY2Vzc0Nhc2U6OmNsb25lKCkgY29uc3QKIHsKICAgICBzdGQ6OnVuaXF1ZV9w dHI8QWNjZXNzQ2FzZT4gcmVzdWx0KG5ldyBBY2Nlc3NDYXNlKCp0aGlzKSk7CkBAIC01NzIsMTAg KzU4MiwxMCBAQCB2b2lkIEFjY2Vzc0Nhc2U6OmdlbmVyYXRlSW1wbChBY2Nlc3NHZW5lCiAKICAg ICAgICAgaWYgKGlzVmFsaWRPZmZzZXQobV9vZmZzZXQpKSB7CiAgICAgICAgICAgICBTdHJ1Y3R1 cmUqIGN1cnJTdHJ1Y3R1cmU7Ci0gICAgICAgICAgICBpZiAobV9jb25kaXRpb25TZXQuaXNFbXB0 eSgpKQorICAgICAgICAgICAgaWYgKCFoYXNBbHRlcm5hdGVCYXNlKCkpCiAgICAgICAgICAgICAg ICAgY3VyclN0cnVjdHVyZSA9IHN0cnVjdHVyZSgpOwogICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgIGN1cnJTdHJ1Y3R1cmUgPSBtX2NvbmRpdGlvblNldC5zbG90QmFzZUNvbmRpdGlv bigpLm9iamVjdCgpLT5zdHJ1Y3R1cmUoKTsKKyAgICAgICAgICAgICAgICBjdXJyU3RydWN0dXJl ID0gYWx0ZXJuYXRlQmFzZSgpLT5zdHJ1Y3R1cmUoKTsKICAgICAgICAgICAgIGN1cnJTdHJ1Y3R1 cmUtPnN0YXJ0V2F0Y2hpbmdQcm9wZXJ0eUZvclJlcGxhY2VtZW50cyh2bSwgb2Zmc2V0KCkpOwog ICAgICAgICB9CiAKQEAgLTYwMyw3ICs2MTMsNyBAQCB2b2lkIEFjY2Vzc0Nhc2U6OmdlbmVyYXRl SW1wbChBY2Nlc3NHZW5lCiAgICAgICAgICAgICAvLyBidXQgaXQnZCByZXF1aXJlIGVtaXR0aW5n IHRoZSBzYW1lIGNvZGUgdG8gbG9hZCB0aGUgYmFzZSB0d2ljZS4KICAgICAgICAgICAgIGJhc2VG b3JBY2Nlc3NHUFIgPSBzY3JhdGNoR1BSOwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg aWYgKCFtX2NvbmRpdGlvblNldC5pc0VtcHR5KCkpIHsKKyAgICAgICAgICAgIGlmIChoYXNBbHRl cm5hdGVCYXNlKCkpIHsKICAgICAgICAgICAgICAgICBqaXQubW92ZSgKICAgICAgICAgICAgICAg ICAgICAgQ0NhbGxIZWxwZXJzOjpUcnVzdGVkSW1tUHRyKGFsdGVybmF0ZUJhc2UoKSksIHNjcmF0 Y2hHUFIpOwogICAgICAgICAgICAgICAgIGJhc2VGb3JBY2Nlc3NHUFIgPSBzY3JhdGNoR1BSOwpA QCAtMTEwMSwxMCArMTExMSwxMCBAQCB2b2lkIEFjY2Vzc0Nhc2U6OmdlbmVyYXRlSW1wbChBY2Nl c3NHZW5lCiAgICAgICAgIC8vIFdlIG5lZWQgdG8gZW5zdXJlIHRoZSBnZXR0ZXIgdmFsdWUgZG9l cyBub3QgbW92ZSBmcm9tIHVuZGVyIHVzLiBOb3RlIHRoYXQgR2V0dGVyU2V0dGVycwogICAgICAg ICAvLyBhcmUgaW1tdXRhYmxlIHNvIHdlIGp1c3QgbmVlZCB0byB3YXRjaCB0aGUgcHJvcGVydHkg bm90IGFueSB2YWx1ZSBpbnNpZGUgaXQuCiAgICAgICAgIFN0cnVjdHVyZSogY3VyclN0cnVjdHVy ZTsKLSAgICAgICAgaWYgKG1fY29uZGl0aW9uU2V0LmlzRW1wdHkoKSkKKyAgICAgICAgaWYgKCFo YXNBbHRlcm5hdGVCYXNlKCkpCiAgICAgICAgICAgICBjdXJyU3RydWN0dXJlID0gc3RydWN0dXJl KCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGN1cnJTdHJ1Y3R1cmUgPSBtX2NvbmRpdGlv blNldC5zbG90QmFzZUNvbmRpdGlvbigpLm9iamVjdCgpLT5zdHJ1Y3R1cmUoKTsKKyAgICAgICAg ICAgIGN1cnJTdHJ1Y3R1cmUgPSBhbHRlcm5hdGVCYXNlKCktPnN0cnVjdHVyZSgpOwogICAgICAg ICBjdXJyU3RydWN0dXJlLT5zdGFydFdhdGNoaW5nUHJvcGVydHlGb3JSZXBsYWNlbWVudHModm0s IG9mZnNldCgpKTsKICAgICAgICAgCiAgICAgICAgIHRoaXMtPmFzPEludHJpbnNpY0dldHRlckFj Y2Vzc0Nhc2U+KCkuZW1pdEludHJpbnNpY0dldHRlcihzdGF0ZSk7CkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvYnl0ZWNvZGUvQWNjZXNzQ2FzZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3NDYXNlLmgJKHJldmlzaW9uIDIzMTIwMSkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9BY2Nlc3NDYXNlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTE0OSw3ICsxNDksOSBAQCBwdWJsaWM6CiAKICAgICBPYmplY3RQcm9wZXJ0eUNvbmRp dGlvblNldCBjb25kaXRpb25TZXQoKSBjb25zdCB7IHJldHVybiBtX2NvbmRpdGlvblNldDsgfQog Ci0gICAgdmlydHVhbCBKU09iamVjdCogYWx0ZXJuYXRlQmFzZSgpIGNvbnN0IHsgcmV0dXJuIGNv bmRpdGlvblNldCgpLnNsb3RCYXNlQ29uZGl0aW9uKCkub2JqZWN0KCk7IH0KKyAgICB2aXJ0dWFs IGJvb2wgaGFzQWx0ZXJuYXRlQmFzZSgpIGNvbnN0OworICAgIHZpcnR1YWwgSlNPYmplY3QqIGFs dGVybmF0ZUJhc2UoKSBjb25zdDsKKyAgICAKICAgICB2aXJ0dWFsIFdhdGNocG9pbnRTZXQqIGFk ZGl0aW9uYWxTZXQoKSBjb25zdCB7IHJldHVybiBudWxscHRyOyB9CiAgICAgdmlydHVhbCBib29s IHZpYVByb3h5KCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KIApJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2J5dGVjb2RlL0dldHRlclNldHRlckFjY2Vzc0Nhc2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9HZXR0ZXJTZXR0ZXJBY2Nlc3NDYXNl LmNwcAkocmV2aXNpb24gMjMxMjAxKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0dldHRlclNldHRlckFjY2Vzc0Nhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsMTEgKzEw MCwxOCBAQCBzdGQ6OnVuaXF1ZV9wdHI8QWNjZXNzQ2FzZT4gR2V0dGVyU2V0dGVyCiAgICAgcmV0 dXJuIFdURk1vdmUocmVzdWx0KTsKIH0KIAorYm9vbCBHZXR0ZXJTZXR0ZXJBY2Nlc3NDYXNlOjpo YXNBbHRlcm5hdGVCYXNlKCkgY29uc3QKK3sKKyAgICBpZiAoY3VzdG9tU2xvdEJhc2UoKSkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIEJhc2U6Omhhc0FsdGVybmF0ZUJhc2UoKTsK K30KKwogSlNPYmplY3QqIEdldHRlclNldHRlckFjY2Vzc0Nhc2U6OmFsdGVybmF0ZUJhc2UoKSBj b25zdAogewogICAgIGlmIChjdXN0b21TbG90QmFzZSgpKQogICAgICAgICByZXR1cm4gY3VzdG9t U2xvdEJhc2UoKTsKLSAgICByZXR1cm4gY29uZGl0aW9uU2V0KCkuc2xvdEJhc2VDb25kaXRpb24o KS5vYmplY3QoKTsKKyAgICByZXR1cm4gQmFzZTo6YWx0ZXJuYXRlQmFzZSgpOwogfQogCiB2b2lk IEdldHRlclNldHRlckFjY2Vzc0Nhc2U6OmR1bXBJbXBsKFByaW50U3RyZWFtJiBvdXQsIENvbW1h UHJpbnRlciYgY29tbWEpIGNvbnN0CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNv ZGUvR2V0dGVyU2V0dGVyQWNjZXNzQ2FzZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ieXRlY29kZS9HZXR0ZXJTZXR0ZXJBY2Nlc3NDYXNlLmgJKHJldmlzaW9uIDIzMTIw MSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ieXRlY29kZS9HZXR0ZXJTZXR0ZXJBY2Nlc3ND YXNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQzLDYgKzQzLDcgQEAgcHVibGljOgogICAgIEpTT2Jq ZWN0KiBjdXN0b21TbG90QmFzZSgpIGNvbnN0IHsgcmV0dXJuIG1fY3VzdG9tU2xvdEJhc2UuZ2V0 KCk7IH0KICAgICBzdGQ6Om9wdGlvbmFsPERPTUF0dHJpYnV0ZUFubm90YXRpb24+IGRvbUF0dHJp YnV0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZG9tQXR0cmlidXRlOyB9CiAKKyAgICBib29sIGhhc0Fs dGVybmF0ZUJhc2UoKSBjb25zdCBvdmVycmlkZTsKICAgICBKU09iamVjdCogYWx0ZXJuYXRlQmFz ZSgpIGNvbnN0IG92ZXJyaWRlOwogCiAgICAgdm9pZCBlbWl0RE9NSklUR2V0dGVyKEFjY2Vzc0dl bmVyYXRpb25TdGF0ZSYsIGNvbnN0IERPTUpJVDo6R2V0dGVyU2V0dGVyKiwgR1BSUmVnIGJhc2VG b3JHZXRHUFIpOwpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL09iamVjdFBy b3BlcnR5Q29uZGl0aW9uU2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvT2JqZWN0UHJvcGVydHlDb25kaXRpb25TZXQuY3BwCShyZXZpc2lvbiAyMzEy MDEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvT2JqZWN0UHJvcGVydHlDb25k aXRpb25TZXQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNzQsNiArMzc0LDI0IEBAIE9iamVjdFBy b3BlcnR5Q29uZGl0aW9uU2V0IGdlbmVyYXRlQ29uZGkKICAgICAgICAgfSk7CiB9CiAKK09iamVj dFByb3BlcnR5Q29uZGl0aW9uU2V0IGdlbmVyYXRlQ29uZGl0aW9uc0ZvclByb3RvdHlwZVByb3Bl cnR5SGl0Q3VzdG9tKAorICAgIFZNJiB2bSwgSlNDZWxsKiBvd25lciwgRXhlY1N0YXRlKiBleGVj LCBTdHJ1Y3R1cmUqIGhlYWRTdHJ1Y3R1cmUsIEpTT2JqZWN0KiBwcm90b3R5cGUsCisgICAgVW5p cXVlZFN0cmluZ0ltcGwqIHVpZCkKK3sKKyAgICByZXR1cm4gZ2VuZXJhdGVDb25kaXRpb25zKAor ICAgICAgICB2bSwgZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLCBoZWFkU3RydWN0dXJlLCBw cm90b3R5cGUsCisgICAgICAgIFsmXSAoVmVjdG9yPE9iamVjdFByb3BlcnR5Q29uZGl0aW9uPiYg Y29uZGl0aW9ucywgSlNPYmplY3QqIG9iamVjdCkgLT4gYm9vbCB7CisgICAgICAgICAgICBpZiAo b2JqZWN0ID09IHByb3RvdHlwZSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgICAgIE9iamVjdFByb3BlcnR5Q29uZGl0aW9uIHJlc3VsdCA9CisgICAgICAgICAgICAgICAg Z2VuZXJhdGVDb25kaXRpb24odm0sIG93bmVyLCBvYmplY3QsIHVpZCwgUHJvcGVydHlDb25kaXRp b246OkFic2VuY2UpOworICAgICAgICAgICAgaWYgKCFyZXN1bHQpCisgICAgICAgICAgICAgICAg cmV0dXJuIGZhbHNlOworICAgICAgICAgICAgY29uZGl0aW9ucy5hcHBlbmQocmVzdWx0KTsKKyAg ICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9KTsKK30KKwogT2JqZWN0UHJvcGVydHlD b25kaXRpb25TZXQgZ2VuZXJhdGVDb25kaXRpb25zRm9yUHJvdG90eXBlRXF1aXZhbGVuY2VDb25j dXJyZW50bHkoCiAgICAgVk0mIHZtLCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBTdHJ1 Y3R1cmUqIGhlYWRTdHJ1Y3R1cmUsIEpTT2JqZWN0KiBwcm90b3R5cGUsIFVuaXF1ZWRTdHJpbmdJ bXBsKiB1aWQpCiB7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvT2JqZWN0 UHJvcGVydHlDb25kaXRpb25TZXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnl0ZWNvZGUvT2JqZWN0UHJvcGVydHlDb25kaXRpb25TZXQuaAkocmV2aXNpb24gMjMxMjAx KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL09iamVjdFByb3BlcnR5Q29uZGl0 aW9uU2V0LmgJKHdvcmtpbmcgY29weSkKQEAgLTE2NSw2ICsxNjUsOSBAQCBPYmplY3RQcm9wZXJ0 eUNvbmRpdGlvblNldCBnZW5lcmF0ZUNvbmRpCiBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvblNldCBn ZW5lcmF0ZUNvbmRpdGlvbnNGb3JQcm90b3R5cGVQcm9wZXJ0eUhpdCgKICAgICBWTSYsIEpTQ2Vs bCogb3duZXIsIEV4ZWNTdGF0ZSosIFN0cnVjdHVyZSogaGVhZFN0cnVjdHVyZSwgSlNPYmplY3Qq IHByb3RvdHlwZSwKICAgICBVbmlxdWVkU3RyaW5nSW1wbCogdWlkKTsKK09iamVjdFByb3BlcnR5 Q29uZGl0aW9uU2V0IGdlbmVyYXRlQ29uZGl0aW9uc0ZvclByb3RvdHlwZVByb3BlcnR5SGl0Q3Vz dG9tKAorICAgIFZNJiwgSlNDZWxsKiBvd25lciwgRXhlY1N0YXRlKiwgU3RydWN0dXJlKiBoZWFk U3RydWN0dXJlLCBKU09iamVjdCogcHJvdG90eXBlLAorICAgIFVuaXF1ZWRTdHJpbmdJbXBsKiB1 aWQpOwogCiBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvblNldCBnZW5lcmF0ZUNvbmRpdGlvbnNGb3JQ cm90b3R5cGVFcXVpdmFsZW5jZUNvbmN1cnJlbnRseSgKICAgICBWTSYsIEpTR2xvYmFsT2JqZWN0 KiwgU3RydWN0dXJlKiBoZWFkU3RydWN0dXJlLCBKU09iamVjdCogcHJvdG90eXBlLApJbmRleDog U291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9SZXBhdGNoLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCShyZXZpc2lvbiAyMzEyMDEpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L1JlcGF0Y2guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0z NTksNyArMzU5LDcgQEAgc3RhdGljIElubGluZUNhY2hlQWN0aW9uIHRyeUNhY2hlR2V0QnlJRAog ICAgICAgICAgICAgICAgICAgICBuZXdDYXNlID0gR2V0dGVyU2V0dGVyQWNjZXNzQ2FzZTo6Y3Jl YXRlKAogICAgICAgICAgICAgICAgICAgICAgICAgdm0sIGNvZGVCbG9jaywgdHlwZSwgb2Zmc2V0 LCBzdHJ1Y3R1cmUsIGNvbmRpdGlvblNldCwgbG9hZFRhcmdldEZyb21Qcm94eSwKICAgICAgICAg ICAgICAgICAgICAgICAgIHNsb3Qud2F0Y2hwb2ludFNldCgpLCBzbG90LmlzQ2FjaGVhYmxlQ3Vz dG9tKCkgPyBzbG90LmN1c3RvbUdldHRlcigpIDogbnVsbHB0ciwKLSAgICAgICAgICAgICAgICAg ICAgICAgIHNsb3QuaXNDYWNoZWFibGVDdXN0b20oKSA/IHNsb3Quc2xvdEJhc2UoKSA6IG51bGxw dHIsCisgICAgICAgICAgICAgICAgICAgICAgICBzbG90LmlzQ2FjaGVhYmxlQ3VzdG9tKCkgJiYg c2xvdC5zbG90QmFzZSgpICE9IGJhc2VWYWx1ZSA/IHNsb3Quc2xvdEJhc2UoKSA6IG51bGxwdHIs CiAgICAgICAgICAgICAgICAgICAgICAgICBkb21BdHRyaWJ1dGUsIFdURk1vdmUocHJvdG90eXBl QWNjZXNzQ2hhaW4pKTsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CkBAIC01Mjks NyArNTI5LDcgQEAgc3RhdGljIElubGluZUNhY2hlQWN0aW9uIHRyeUNhY2hlUHV0QnlJRAogICAg ICAgICAgICAgICAgICAgICBpZiAoIXVzZXNQb2x5UHJvdG8pIHsKICAgICAgICAgICAgICAgICAg ICAgICAgIHByb3RvdHlwZUFjY2Vzc0NoYWluID0gbnVsbHB0cjsKICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbmRpdGlvblNldCA9Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2VuZXJh dGVDb25kaXRpb25zRm9yUHJvdG90eXBlUHJvcGVydHlIaXQoCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgZ2VuZXJhdGVDb25kaXRpb25zRm9yUHJvdG90eXBlUHJvcGVydHlIaXRDdXN0b20o CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZtLCBjb2RlQmxvY2ssIGV4ZWMsIHN0 cnVjdHVyZSwgc2xvdC5iYXNlKCksIGlkZW50LmltcGwoKSk7CiAgICAgICAgICAgICAgICAgICAg ICAgICBpZiAoIWNvbmRpdGlvblNldC5pc1ZhbGlkKCkpCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIEdpdmVVcE9uQ2FjaGU7CkBAIC01MzgsNyArNTM4LDcgQEAgc3RhdGljIElu bGluZUNhY2hlQWN0aW9uIHRyeUNhY2hlUHV0QnlJRAogCiAgICAgICAgICAgICAgICAgbmV3Q2Fz ZSA9IEdldHRlclNldHRlckFjY2Vzc0Nhc2U6OmNyZWF0ZSgKICAgICAgICAgICAgICAgICAgICAg dm0sIGNvZGVCbG9jaywgc2xvdC5pc0N1c3RvbUFjY2Vzc29yKCkgPyBBY2Nlc3NDYXNlOjpDdXN0 b21BY2Nlc3NvclNldHRlciA6IEFjY2Vzc0Nhc2U6OkN1c3RvbVZhbHVlU2V0dGVyLCBzdHJ1Y3R1 cmUsIGludmFsaWRPZmZzZXQsCi0gICAgICAgICAgICAgICAgICAgIGNvbmRpdGlvblNldCwgV1RG TW92ZShwcm90b3R5cGVBY2Nlc3NDaGFpbiksIHNsb3QuY3VzdG9tU2V0dGVyKCksIHNsb3QuYmFz ZSgpKTsKKyAgICAgICAgICAgICAgICAgICAgY29uZGl0aW9uU2V0LCBXVEZNb3ZlKHByb3RvdHlw ZUFjY2Vzc0NoYWluKSwgc2xvdC5jdXN0b21TZXR0ZXIoKSwgc2xvdC5iYXNlKCkgIT0gYmFzZVZh bHVlID8gc2xvdC5iYXNlKCkgOiBudWxscHRyKTsKICAgICAgICAgICAgIH0gZWxzZSB7CiAgICAg ICAgICAgICAgICAgT2JqZWN0UHJvcGVydHlDb25kaXRpb25TZXQgY29uZGl0aW9uU2V0OwogICAg ICAgICAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxQb2x5UHJvdG9BY2Nlc3NDaGFpbj4gcHJvdG90 eXBlQWNjZXNzQ2hhaW47Cg==