220031 2020-12-18 16:07:16 -0800 DFG should make sure replacement watchpoint is fired before folding to PutByOffset 2021-07-20 12:35:06 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 keith_miller keith_miller aperez ews-watchlist magomez mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1715842 0 keith_miller 2020-12-18 16:07:16 -0800 DFG should make sure replacement watchpoint is fired before folding to PutByOffset 1715844 1 416556 keith_miller 2020-12-18 16:08:11 -0800 Created attachment 416556 Patch 1716041 2 416613 keith_miller 2020-12-21 11:18:51 -0800 Created attachment 416613 Patch for landing 1716050 3 ews-feeder 2020-12-21 11:54:39 -0800 Committed r271034: <https://trac.webkit.org/changeset/271034> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416613. 1716051 4 webkit-bug-importer 2020-12-21 11:55:16 -0800 <rdar://problem/72557731> 416556 2020-12-18 16:08:11 -0800 2020-12-21 11:18:49 -0800 Patch bug-220031-20201218160811.patch text/plain 4941 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwOTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 YjQwNzJlYTljZDQ2ZTUzMDBlZWYyNmRjZGIzZmVmN2U5ZWViYjFiLi5lYzVlMzBkNTEyYzFlMTBi MGM5NDg1ZWEzNzJiYWFiZjZiOWI5OGUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMC0xMi0xOCAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBERkcgc2hvdWxkIG1ha2Ugc3VyZSByZXBsYWNlbWVudCB3YXRjaHBv aW50IGlzIGZpcmVkIGJlZm9yZSBmb2xkaW5nIHRvIFB1dEJ5T2Zmc2V0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAwMzEKKyAgICAgICAgPHJkYXI6 Ly83MjA0NTM1MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIGRmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0 ZUNvZGVQYXJzZXI6OmNoZWNrUHJlc2VuY2VMaWtlRm9yUmVwbGFjZSk6CisgICAgICAgIChKU0M6 OkRGRzo6Qnl0ZUNvZGVQYXJzZXI6OnN0b3JlKToKKyAgICAgICAgKiBkZmcvREZHQ29uc3RhbnRG b2xkaW5nUGhhc2UuY3BwOgorICAgICAgICAoSlNDOjpERkc6OkNvbnN0YW50Rm9sZGluZ1BoYXNl Ojp0cnlGb2xkQXNQdXRCeU9mZnNldCk6CisgICAgICAgICogcnVudGltZS9TdHJ1Y3R1cmUuY3Bw OgorICAgICAgICAoSlNDOjpTdHJ1Y3R1cmU6OmR1bXAgY29uc3QpOgorCiAyMDIwLTEyLTE2ICBZ dXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAgICAgW0pTQ10gTm90IHVz aW5nIEpJVENhZ2UgdHJhbXBvbGluZSBmb3Igbm9uIEpJVENhZ2UgSlNDCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwCmluZGV4IDk1MzBjZTFjODBl MjE0ZjlmZjNlMWExOTgyYTJiZmI4MjBmMDkxNzYuLjM2ZWNjNGNlOGIyMDc4YzdiMmFmYmRiZDlm NWVhZWYzNDJlMmM4Y2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Qnl0ZUNvZGVQYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0 ZUNvZGVQYXJzZXIuY3BwCkBAIC0yMzQsNyArMjM0LDcgQEAgcHJpdmF0ZToKICAgICAvLyB3YXkg YXMgaW4gYWxsIG9mIHRoZSBzdHJ1Y3R1cmVzIGluIHRoZSBzZXQuIEl0IG1heSBlbWl0IGNvZGUg aW5zdGVhZCBvZiBqdXN0IHNldHRpbmcgYSB3YXRjaHBvaW50LgogICAgIC8vIFJldHVybnMgdHJ1 ZSBpZiB0aGlzIGFsbCB3b3JrcyBvdXQuCiAgICAgYm9vbCBjaGVja1ByZXNlbmNlTGlrZShKU09i amVjdCoga25vd25CYXNlLCBVbmlxdWVkU3RyaW5nSW1wbCosIFByb3BlcnR5T2Zmc2V0LCBjb25z dCBTdHJ1Y3R1cmVTZXQmKTsKLSAgICB2b2lkIGNoZWNrUHJlc2VuY2VMaWtlKE5vZGUqIGJhc2Us IFVuaXF1ZWRTdHJpbmdJbXBsKiwgUHJvcGVydHlPZmZzZXQsIGNvbnN0IFN0cnVjdHVyZVNldCYp OworICAgIHZvaWQgY2hlY2tQcmVzZW5jZUxpa2VGb3JSZXBsYWNlKE5vZGUqIGJhc2UsIFVuaXF1 ZWRTdHJpbmdJbXBsKiwgUHJvcGVydHlPZmZzZXQsIGNvbnN0IFN0cnVjdHVyZVNldCYpOwogICAg IAogICAgIC8vIFdvcmtzIHdpdGggYm90aCBHZXRCeUlkVmFyaWFudCBhbmQgdGhlIHNldHRlciBm b3JtIG9mIFB1dEJ5SWRWYXJpYW50LgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFZhcmlhbnRUeXBl PgpAQCAtNDQxMCwxMiArNDQxMCwxOCBAQCBib29sIEJ5dGVDb2RlUGFyc2VyOjpjaGVja1ByZXNl bmNlTGlrZSgKICAgICByZXR1cm4gY2hlY2socHJlc2VuY2VMaWtlKGtub3duQmFzZSwgdWlkLCBv ZmZzZXQsIHNldCkpOwogfQogCi12b2lkIEJ5dGVDb2RlUGFyc2VyOjpjaGVja1ByZXNlbmNlTGlr ZSgKK3ZvaWQgQnl0ZUNvZGVQYXJzZXI6OmNoZWNrUHJlc2VuY2VMaWtlRm9yUmVwbGFjZSgKICAg ICBOb2RlKiBiYXNlLCBVbmlxdWVkU3RyaW5nSW1wbCogdWlkLCBQcm9wZXJ0eU9mZnNldCBvZmZz ZXQsIGNvbnN0IFN0cnVjdHVyZVNldCYgc2V0KQogewogICAgIGlmIChKU09iamVjdCoga25vd25C YXNlID0gYmFzZS0+ZHluYW1pY0Nhc3RDb25zdGFudDxKU09iamVjdCo+KCptX3ZtKSkgewotICAg ICAgICBpZiAoY2hlY2tQcmVzZW5jZUxpa2Uoa25vd25CYXNlLCB1aWQsIG9mZnNldCwgc2V0KSkK KyAgICAgICAgYXV0byBjb25kaXRpb24gPSBwcmVzZW5jZUxpa2Uoa25vd25CYXNlLCB1aWQsIG9m ZnNldCwgc2V0KTsKKyAgICAgICAgaWYgKGNoZWNrKGNvbmRpdGlvbikpIHsKKyAgICAgICAgICAg IGF1dG8qIHdhdGNocG9pbnRTZXQgPSBrbm93bkJhc2UtPnN0cnVjdHVyZSgqbV92bSktPnByb3Bl cnR5UmVwbGFjZW1lbnRXYXRjaHBvaW50U2V0KGNvbmRpdGlvbi5vZmZzZXQoKSk7CisgICAgICAg ICAgICAvLyBUaGlzIG1lYW5zIHRoYXQgd2UgcHJvYmFibHkgaGF2ZSBhIHN0YWxlIGNhY2hlIGFu ZCB3ZSBzaG91bGQgZ2F0aGVyIG1vcmUgaW5mb3JtYXRpb24uCisgICAgICAgICAgICBpZiAoIXdh dGNocG9pbnRTZXQgfHwgd2F0Y2hwb2ludFNldC0+aXNTdGlsbFZhbGlkKCkpCisgICAgICAgICAg ICAgICAgYWRkVG9HcmFwaChGb3JjZU9TUkV4aXQpOwogICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICB9CiAgICAgfQogCiAgICAgYWRkVG9HcmFwaChDaGVja1N0cnVjdHVyZSwgT3BJbmZvKG1f Z3JhcGguYWRkU3RydWN0dXJlU2V0KHNldCkpLCBiYXNlKTsKQEAgLTQ1MjUsNyArNDUzMSw3IEBA IE5vZGUqIEJ5dGVDb2RlUGFyc2VyOjpzdG9yZShOb2RlKiBiYXNlLCB1bnNpZ25lZCBpZGVudGlm aWVyLCBjb25zdCBQdXRCeUlkVmFyaWFuCiB7CiAgICAgUkVMRUFTRV9BU1NFUlQodmFyaWFudC5r aW5kKCkgPT0gUHV0QnlJZFZhcmlhbnQ6OlJlcGxhY2UpOwogCi0gICAgY2hlY2tQcmVzZW5jZUxp a2UoYmFzZSwgbV9ncmFwaC5pZGVudGlmaWVycygpW2lkZW50aWZpZXJdLCB2YXJpYW50Lm9mZnNl dCgpLCB2YXJpYW50LnN0cnVjdHVyZSgpKTsKKyAgICBjaGVja1ByZXNlbmNlTGlrZUZvclJlcGxh Y2UoYmFzZSwgbV9ncmFwaC5pZGVudGlmaWVycygpW2lkZW50aWZpZXJdLCB2YXJpYW50Lm9mZnNl dCgpLCB2YXJpYW50LnN0cnVjdHVyZSgpKTsKICAgICByZXR1cm4gaGFuZGxlUHV0QnlPZmZzZXQo YmFzZSwgaWRlbnRpZmllciwgdmFyaWFudC5vZmZzZXQoKSwgdmFsdWUpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbnN0YW50Rm9sZGluZ1BoYXNlLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3Bw CmluZGV4IGViYWJhYzExZDk1OWJlY2E5ZjMwZGQxMjdjNjgwY2UwYTNlYTJlZDEuLjQyZmZhMjIx NWZlZmI1ZTA2YzA5YmU1N2IxMGE5OTQyN2ViNGQ1NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwCisrKyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwCkBAIC0xNDI3LDYg KzE0MjcsMTIgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBpZiAoIWNvbmRpdGlvbi5zdHJ1 Y3R1cmVFbnN1cmVzVmFsaWRpdHkoc3RydWN0dXJlKSkKICAgICAgICAgICAgICAgICAgICAgcmV0 dXJuOwogCisgICAgICAgICAgICAgICAgaWYgKHZhcmlhbnQua2luZCgpID09IFB1dEJ5SWRWYXJp YW50OjpSZXBsYWNlKSB7CisgICAgICAgICAgICAgICAgICAgIGF1dG8qIHdhdGNocG9pbnRzID0g c3RydWN0dXJlLT5wcm9wZXJ0eVJlcGxhY2VtZW50V2F0Y2hwb2ludFNldChjb25kaXRpb24ub2Zm c2V0KCkpOworICAgICAgICAgICAgICAgICAgICBpZiAoIXdhdGNocG9pbnRzIHx8IHdhdGNocG9p bnRzLT5pc1N0aWxsVmFsaWQoKSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgICAgICB9CisKICAgICAgICAgICAgICAgICBtX2luc2VydGlvblNldC5pbnNlcnRO b2RlKAogICAgICAgICAgICAgICAgICAgICBpbmRleEluQmxvY2ssIFNwZWNOb25lLCBDaGVja1N0 cnVjdHVyZSwgbm9kZS0+b3JpZ2luLAogICAgICAgICAgICAgICAgICAgICBPcEluZm8obV9ncmFw aC5hZGRTdHJ1Y3R1cmVTZXQoc3RydWN0dXJlKSksCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvU3RydWN0dXJlLmNwcAppbmRleCAwY2M2NjcwZWM5ODNlM2QyNjU4OTZmZTVlMzcwYzA5 ZDczODkxMTk0Li5mNTNlMmQzMjU0NmVhY2M2NmMzYWI0NGE3MjVhYjliODVlN2E5NTVmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAKQEAgLTE0MDgsNiAr MTQwOCw5IEBAIHZvaWQgU3RydWN0dXJlOjpkdW1wKFByaW50U3RyZWFtJiBvdXQpIGNvbnN0CiAg ICAgZWxzZSBpZiAodHJhbnNpdGlvbldhdGNocG9pbnRJc0xpa2VseVRvQmVGaXJlZCgpKQogICAg ICAgICBvdXQucHJpbnQoIiwgU2hhZHkgbGVhZiIpOwogICAgIAorICAgIGlmICh0cmFuc2l0aW9u V2F0Y2hwb2ludFNldCgpLmlzQmVpbmdXYXRjaGVkKCkpCisgICAgICAgIG91dC5wcmludCgiIChX YXRjaGVkKSIpOworCiAgICAgb3V0LnByaW50KCJdIik7CiB9CiAK 416613 2020-12-21 11:18:51 -0800 2020-12-21 11:54:39 -0800 Patch for landing bug-220031-20201221111850.patch text/plain 7171 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwOTM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 YjQwNzJlYTljZDQ2ZTUzMDBlZWYyNmRjZGIzZmVmN2U5ZWViYjFiLi45YWI5NzA2ZjlkY2FhODQ4 YWYyZTY0MDM5ZDhlODkzZjJjYTg3NjA0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAyMC0xMi0yMSAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBERkcgc2hvdWxkIG1ha2Ugc3VyZSByZXBsYWNlbWVudCB3YXRjaHBv aW50IGlzIGZpcmVkIGJlZm9yZSBmb2xkaW5nIHRvIFB1dEJ5T2Zmc2V0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAwMzEKKyAgICAgICAgPHJkYXI6 Ly83MjA0NTM1MD4KKworICAgICAgICBSZXZpZXdlZCBieSBTYWFtIEJhcmF0aS4KKworICAgICAg ICAqIGRmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNv ZGVQYXJzZXI6OnByZXNlbmNlQ29uZGl0aW9uSWZDb25zaXN0ZW50KToKKyAgICAgICAgKEpTQzo6 REZHOjpCeXRlQ29kZVBhcnNlcjo6Y2hlY2tQcmVzZW5jZSk6CisgICAgICAgIChKU0M6OkRGRzo6 Qnl0ZUNvZGVQYXJzZXI6OmNoZWNrUHJlc2VuY2VGb3JSZXBsYWNlKToKKyAgICAgICAgKEpTQzo6 REZHOjpCeXRlQ29kZVBhcnNlcjo6bG9hZCk6CisgICAgICAgIChKU0M6OkRGRzo6Qnl0ZUNvZGVQ YXJzZXI6OnN0b3JlKToKKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6cHJlc2Vu Y2VMaWtlKTogRGVsZXRlZC4KKyAgICAgICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6Y2hl Y2tQcmVzZW5jZUxpa2UpOiBEZWxldGVkLgorICAgICAgICAqIGRmZy9ERkdDb25zdGFudEZvbGRp bmdQaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6Q29uc3RhbnRGb2xkaW5nUGhhc2U6OnRy eUZvbGRBc1B1dEJ5T2Zmc2V0KToKKyAgICAgICAgKiBydW50aW1lL1N0cnVjdHVyZS5jcHA6Cisg ICAgICAgIChKU0M6OlN0cnVjdHVyZTo6ZHVtcCBjb25zdCk6CisKIDIwMjAtMTItMTYgIFl1c3Vr ZSBTdXp1a2kgIDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBOb3QgdXNpbmcg SklUQ2FnZSB0cmFtcG9saW5lIGZvciBub24gSklUQ2FnZSBKU0MKZGlmZiAtLWdpdCBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQnl0ZUNvZGVQYXJzZXIuY3BwIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5jcHAKaW5kZXggOTUzMGNlMWM4MGUyMTRm OWZmM2UxYTE5ODJhMmJmYjgyMGYwOTE3Ni4uNjM3OTJkNDJiZDRkYzgxMTIwZmU2ZGQwM2Q3MmZj Y2EyOWJmNzg1NSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRl Q29kZVBhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29k ZVBhcnNlci5jcHAKQEAgLTIyNywxNCArMjI3LDE0IEBAIHByaXZhdGU6CiAKICAgICAvLyBDcmVh dGUgYSBwcmVzZW5jZSBPYmplY3RQcm9wZXJ0eUNvbmRpdGlvbiBiYXNlZCBvbiBzb21lIGtub3du IG9mZnNldCBhbmQgc3RydWN0dXJlIHNldC4gRG9lcyBub3QKICAgICAvLyBjaGVjayB0aGUgdmFs aWRpdHkgb2YgdGhlIGNvbmRpdGlvbiwgYnV0IGl0IG1heSByZXR1cm4gYSBudWxsIG9uZSBpZiBp dCBlbmNvdW50ZXJzIGEgY29udHJhZGljdGlvbi4KLSAgICBPYmplY3RQcm9wZXJ0eUNvbmRpdGlv biBwcmVzZW5jZUxpa2UoCisgICAgT2JqZWN0UHJvcGVydHlDb25kaXRpb24gcHJlc2VuY2VDb25k aXRpb25JZkNvbnNpc3RlbnQoCiAgICAgICAgIEpTT2JqZWN0KiBrbm93bkJhc2UsIFVuaXF1ZWRT dHJpbmdJbXBsKiwgUHJvcGVydHlPZmZzZXQsIGNvbnN0IFN0cnVjdHVyZVNldCYpOwogICAgIAog ICAgIC8vIEF0dGVtcHQgdG8gd2F0Y2ggdGhlIHByZXNlbmNlIG9mIGEgcHJvcGVydHkuIEl0IHdp bGwgd2F0Y2ggdGhhdCB0aGUgcHJvcGVydHkgaXMgcHJlc2VudCBpbiB0aGUgc2FtZQogICAgIC8v IHdheSBhcyBpbiBhbGwgb2YgdGhlIHN0cnVjdHVyZXMgaW4gdGhlIHNldC4gSXQgbWF5IGVtaXQg Y29kZSBpbnN0ZWFkIG9mIGp1c3Qgc2V0dGluZyBhIHdhdGNocG9pbnQuCiAgICAgLy8gUmV0dXJu cyB0cnVlIGlmIHRoaXMgYWxsIHdvcmtzIG91dC4KLSAgICBib29sIGNoZWNrUHJlc2VuY2VMaWtl KEpTT2JqZWN0KiBrbm93bkJhc2UsIFVuaXF1ZWRTdHJpbmdJbXBsKiwgUHJvcGVydHlPZmZzZXQs IGNvbnN0IFN0cnVjdHVyZVNldCYpOwotICAgIHZvaWQgY2hlY2tQcmVzZW5jZUxpa2UoTm9kZSog YmFzZSwgVW5pcXVlZFN0cmluZ0ltcGwqLCBQcm9wZXJ0eU9mZnNldCwgY29uc3QgU3RydWN0dXJl U2V0Jik7CisgICAgYm9vbCBjaGVja1ByZXNlbmNlKEpTT2JqZWN0KiBrbm93bkJhc2UsIFVuaXF1 ZWRTdHJpbmdJbXBsKiwgUHJvcGVydHlPZmZzZXQsIGNvbnN0IFN0cnVjdHVyZVNldCYpOworICAg IHZvaWQgY2hlY2tQcmVzZW5jZUZvclJlcGxhY2UoTm9kZSogYmFzZSwgVW5pcXVlZFN0cmluZ0lt cGwqLCBQcm9wZXJ0eU9mZnNldCwgY29uc3QgU3RydWN0dXJlU2V0Jik7CiAgICAgCiAgICAgLy8g V29ya3Mgd2l0aCBib3RoIEdldEJ5SWRWYXJpYW50IGFuZCB0aGUgc2V0dGVyIGZvcm0gb2YgUHV0 QnlJZFZhcmlhbnQuCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVmFyaWFudFR5cGU+CkBAIC00Mzg2 LDcgKzQzODYsNyBAQCBOb2RlKiBCeXRlQ29kZVBhcnNlcjo6bG9hZCgKICAgICAgICAgbWV0aG9k LCBvcCk7CiB9CiAKLU9iamVjdFByb3BlcnR5Q29uZGl0aW9uIEJ5dGVDb2RlUGFyc2VyOjpwcmVz ZW5jZUxpa2UoCitPYmplY3RQcm9wZXJ0eUNvbmRpdGlvbiBCeXRlQ29kZVBhcnNlcjo6cHJlc2Vu Y2VDb25kaXRpb25JZkNvbnNpc3RlbnQoCiAgICAgSlNPYmplY3QqIGtub3duQmFzZSwgVW5pcXVl ZFN0cmluZ0ltcGwqIHVpZCwgUHJvcGVydHlPZmZzZXQgb2Zmc2V0LCBjb25zdCBTdHJ1Y3R1cmVT ZXQmIHNldCkKIHsKICAgICBpZiAoc2V0LmlzRW1wdHkoKSkKQEAgLTQ0MDQsMTggKzQ0MDQsMjQg QEAgT2JqZWN0UHJvcGVydHlDb25kaXRpb24gQnl0ZUNvZGVQYXJzZXI6OnByZXNlbmNlTGlrZSgK ICAgICByZXR1cm4gT2JqZWN0UHJvcGVydHlDb25kaXRpb246OnByZXNlbmNlV2l0aG91dEJhcnJp ZXIoa25vd25CYXNlLCB1aWQsIG9mZnNldCwgYXR0cmlidXRlcyk7CiB9CiAKLWJvb2wgQnl0ZUNv ZGVQYXJzZXI6OmNoZWNrUHJlc2VuY2VMaWtlKAorYm9vbCBCeXRlQ29kZVBhcnNlcjo6Y2hlY2tQ cmVzZW5jZSgKICAgICBKU09iamVjdCoga25vd25CYXNlLCBVbmlxdWVkU3RyaW5nSW1wbCogdWlk LCBQcm9wZXJ0eU9mZnNldCBvZmZzZXQsIGNvbnN0IFN0cnVjdHVyZVNldCYgc2V0KQogewotICAg IHJldHVybiBjaGVjayhwcmVzZW5jZUxpa2Uoa25vd25CYXNlLCB1aWQsIG9mZnNldCwgc2V0KSk7 CisgICAgcmV0dXJuIGNoZWNrKHByZXNlbmNlQ29uZGl0aW9uSWZDb25zaXN0ZW50KGtub3duQmFz ZSwgdWlkLCBvZmZzZXQsIHNldCkpOwogfQogCi12b2lkIEJ5dGVDb2RlUGFyc2VyOjpjaGVja1By ZXNlbmNlTGlrZSgKK3ZvaWQgQnl0ZUNvZGVQYXJzZXI6OmNoZWNrUHJlc2VuY2VGb3JSZXBsYWNl KAogICAgIE5vZGUqIGJhc2UsIFVuaXF1ZWRTdHJpbmdJbXBsKiB1aWQsIFByb3BlcnR5T2Zmc2V0 IG9mZnNldCwgY29uc3QgU3RydWN0dXJlU2V0JiBzZXQpCiB7CiAgICAgaWYgKEpTT2JqZWN0KiBr bm93bkJhc2UgPSBiYXNlLT5keW5hbWljQ2FzdENvbnN0YW50PEpTT2JqZWN0Kj4oKm1fdm0pKSB7 Ci0gICAgICAgIGlmIChjaGVja1ByZXNlbmNlTGlrZShrbm93bkJhc2UsIHVpZCwgb2Zmc2V0LCBz ZXQpKQorICAgICAgICBhdXRvIGNvbmRpdGlvbiA9IHByZXNlbmNlQ29uZGl0aW9uSWZDb25zaXN0 ZW50KGtub3duQmFzZSwgdWlkLCBvZmZzZXQsIHNldCk7CisgICAgICAgIGlmIChjaGVjayhjb25k aXRpb24pKSB7CisgICAgICAgICAgICBhdXRvKiB3YXRjaHBvaW50U2V0ID0ga25vd25CYXNlLT5z dHJ1Y3R1cmUoKm1fdm0pLT5wcm9wZXJ0eVJlcGxhY2VtZW50V2F0Y2hwb2ludFNldChjb25kaXRp b24ub2Zmc2V0KCkpOworICAgICAgICAgICAgLy8gVGhpcyBtZWFucyB0aGF0IHdlIHByb2JhYmx5 IGhhdmUgYSBzdGFsZSBjYWNoZSBhbmQgd2Ugc2hvdWxkIGdhdGhlciBtb3JlIGluZm9ybWF0aW9u LgorICAgICAgICAgICAgaWYgKCF3YXRjaHBvaW50U2V0IHx8IHdhdGNocG9pbnRTZXQtPmlzU3Rp bGxWYWxpZCgpKQorICAgICAgICAgICAgICAgIGFkZFRvR3JhcGgoRm9yY2VPU1JFeGl0KTsKICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgfQogICAgIH0KIAogICAgIGFkZFRvR3JhcGgoQ2hl Y2tTdHJ1Y3R1cmUsIE9wSW5mbyhtX2dyYXBoLmFkZFN0cnVjdHVyZVNldChzZXQpKSwgYmFzZSk7 CkBAIC00NDY4LDcgKzQ0NzQsNyBAQCBOb2RlKiBCeXRlQ29kZVBhcnNlcjo6bG9hZCgKICAgICAg ICAgICAgICAgICAvLyBwcm9wZXJ0eSBpcyB3YXRjaGFibHkgcHJlc2VudCwgaW4gd2hpY2ggY2Fz ZSB3ZSBnZXQgcmlkIG9mIHRoZSBzdHJ1Y3R1cmUgY2hlY2suCiAKICAgICAgICAgICAgICAgICBP YmplY3RQcm9wZXJ0eUNvbmRpdGlvbiBwcmVzZW5jZUNvbmRpdGlvbiA9Ci0gICAgICAgICAgICAg ICAgICAgIHByZXNlbmNlTGlrZShrbm93bkJhc2UsIHVpZCwgdmFyaWFudC5vZmZzZXQoKSwgdmFy aWFudC5zdHJ1Y3R1cmVTZXQoKSk7CisgICAgICAgICAgICAgICAgICAgIHByZXNlbmNlQ29uZGl0 aW9uSWZDb25zaXN0ZW50KGtub3duQmFzZSwgdWlkLCB2YXJpYW50Lm9mZnNldCgpLCB2YXJpYW50 LnN0cnVjdHVyZVNldCgpKTsKICAgICAgICAgICAgICAgICBpZiAocHJlc2VuY2VDb25kaXRpb24p IHsKICAgICAgICAgICAgICAgICAgICAgT2JqZWN0UHJvcGVydHlDb25kaXRpb24gZXF1aXZhbGVu Y2VDb25kaXRpb24gPQogICAgICAgICAgICAgICAgICAgICAgICAgcHJlc2VuY2VDb25kaXRpb24u YXR0ZW1wdFRvTWFrZUVxdWl2YWxlbmNlV2l0aG91dEJhcnJpZXIoKm1fdm0pOwpAQCAtNDUyNSw3 ICs0NTMxLDcgQEAgTm9kZSogQnl0ZUNvZGVQYXJzZXI6OnN0b3JlKE5vZGUqIGJhc2UsIHVuc2ln bmVkIGlkZW50aWZpZXIsIGNvbnN0IFB1dEJ5SWRWYXJpYW4KIHsKICAgICBSRUxFQVNFX0FTU0VS VCh2YXJpYW50LmtpbmQoKSA9PSBQdXRCeUlkVmFyaWFudDo6UmVwbGFjZSk7CiAKLSAgICBjaGVj a1ByZXNlbmNlTGlrZShiYXNlLCBtX2dyYXBoLmlkZW50aWZpZXJzKClbaWRlbnRpZmllcl0sIHZh cmlhbnQub2Zmc2V0KCksIHZhcmlhbnQuc3RydWN0dXJlKCkpOworICAgIGNoZWNrUHJlc2VuY2VG b3JSZXBsYWNlKGJhc2UsIG1fZ3JhcGguaWRlbnRpZmllcnMoKVtpZGVudGlmaWVyXSwgdmFyaWFu dC5vZmZzZXQoKSwgdmFyaWFudC5zdHJ1Y3R1cmUoKSk7CiAgICAgcmV0dXJuIGhhbmRsZVB1dEJ5 T2Zmc2V0KGJhc2UsIGlkZW50aWZpZXIsIHZhcmlhbnQub2Zmc2V0KCksIHZhbHVlKTsKIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb25zdGFudEZvbGRpbmdQ aGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbnN0YW50Rm9sZGluZ1Bo YXNlLmNwcAppbmRleCBlYmFiYWMxMWQ5NTliZWNhOWYzMGRkMTI3YzY4MGNlMGEzZWEyZWQxLi40 MmZmYTIyMTVmZWZiNWUwNmMwOWJlNTdiMTBhOTk0MjdlYjRkNTU1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbnN0YW50Rm9sZGluZ1BoYXNlLmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0NvbnN0YW50Rm9sZGluZ1BoYXNlLmNwcApAQCAt MTQyNyw2ICsxNDI3LDEyIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgaWYgKCFjb25kaXRp b24uc3RydWN0dXJlRW5zdXJlc1ZhbGlkaXR5KHN0cnVjdHVyZSkpCiAgICAgICAgICAgICAgICAg ICAgIHJldHVybjsKIAorICAgICAgICAgICAgICAgIGlmICh2YXJpYW50LmtpbmQoKSA9PSBQdXRC eUlkVmFyaWFudDo6UmVwbGFjZSkgeworICAgICAgICAgICAgICAgICAgICBhdXRvKiB3YXRjaHBv aW50cyA9IHN0cnVjdHVyZS0+cHJvcGVydHlSZXBsYWNlbWVudFdhdGNocG9pbnRTZXQoY29uZGl0 aW9uLm9mZnNldCgpKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCF3YXRjaHBvaW50cyB8fCB3 YXRjaHBvaW50cy0+aXNTdGlsbFZhbGlkKCkpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1 cm47CisgICAgICAgICAgICAgICAgfQorCiAgICAgICAgICAgICAgICAgbV9pbnNlcnRpb25TZXQu aW5zZXJ0Tm9kZSgKICAgICAgICAgICAgICAgICAgICAgaW5kZXhJbkJsb2NrLCBTcGVjTm9uZSwg Q2hlY2tTdHJ1Y3R1cmUsIG5vZGUtPm9yaWdpbiwKICAgICAgICAgICAgICAgICAgICAgT3BJbmZv KG1fZ3JhcGguYWRkU3RydWN0dXJlU2V0KHN0cnVjdHVyZSkpLApkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAKaW5kZXggMGNjNjY3MGVjOTgzZTNkMjY1ODk2ZmU1 ZTM3MGMwOWQ3Mzg5MTE5NC4uZjUzZTJkMzI1NDZlYWNjNjZjM2FiNDRhNzI1YWI5Yjg1ZTdhOTU1 ZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU3RydWN0dXJlLmNw cAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwCkBAIC0x NDA4LDYgKzE0MDgsOSBAQCB2b2lkIFN0cnVjdHVyZTo6ZHVtcChQcmludFN0cmVhbSYgb3V0KSBj b25zdAogICAgIGVsc2UgaWYgKHRyYW5zaXRpb25XYXRjaHBvaW50SXNMaWtlbHlUb0JlRmlyZWQo KSkKICAgICAgICAgb3V0LnByaW50KCIsIFNoYWR5IGxlYWYiKTsKICAgICAKKyAgICBpZiAodHJh bnNpdGlvbldhdGNocG9pbnRTZXQoKS5pc0JlaW5nV2F0Y2hlZCgpKQorICAgICAgICBvdXQucHJp bnQoIiAoV2F0Y2hlZCkiKTsKKwogICAgIG91dC5wcmludCgiXSIpOwogfQogCg==