185177 2018-05-01 18:31:30 -0700 Don't prevent CreateThis being folded to NewObject when the structure is poly proto 2018-05-03 21:34:21 -0700 1 1 1 Unclassified WebKit JavaScriptCore Safari Technology Preview Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 177517 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov jfbastien keith_miller mark.lam msaboff rmorisset ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1419502 0 saam 2018-05-01 18:31:30 -0700 ... 1419504 1 339253 saam 2018-05-01 18:39:41 -0700 Created attachment 339253 patch 1420552 2 339253 commit-queue 2018-05-03 21:33:58 -0700 Comment on attachment 339253 patch Clearing flags on attachment: 339253 Committed r231345: <https://trac.webkit.org/changeset/231345> 1420553 3 commit-queue 2018-05-03 21:34:00 -0700 All reviewed patches have been landed. Closing bug. 1420554 4 webkit-bug-importer 2018-05-03 21:34:21 -0700 <rdar://problem/39966288> 339253 2018-05-01 18:39:41 -0700 2018-05-03 21:33:58 -0700 patch c-backup.diff text/plain 24457 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyMzEyMjApCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDIwIEBACisyMDE4LTA1LTAxICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIERvbid0IHByZXZlbnQgQ3JlYXRlVGhpcyBiZWluZyBmb2xkZWQgdG8g TmV3T2JqZWN0IHdoZW4gdGhlIHN0cnVjdHVyZSBpcyBwb2x5IHByb3RvCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODUxNzcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1pY3JvYmVuY2htYXJrcy9jb25z dHJ1Y3QtcG9seS1wcm90by1vYmplY3QuanM6IEFkZGVkLgorICAgICAgICAoZm9vLkEpOgorICAg ICAgICAoZm9vKToKKyAgICAgICAgKiBzdHJlc3MvYWxsb2NhdGlvbi1zaW5raW5nLW5ldy1vYmpl Y3Qtd2l0aC1wb2x5LXByb3RvLmpzOiBBZGRlZC4KKyAgICAgICAgKGZvby5BKToKKyAgICAgICAg KGZvbyk6CisgICAgICAgIChtYWtlUG9seVByb3RvKToKKyAgICAgICAgKGJhcik6CisgICAgICAg IChiYXopOgorCiAyMDE4LTA1LTAxICBSb2JpbiBNb3Jpc3NldCAgPHJtb3Jpc3NldEBhcHBsZS5j b20+CiAKICAgICAgICAgQ29ycmVjdGx5IGRldGVjdCBzdHJpbmcgb3ZlcmZsb3cgd2hlbiB1c2lu ZyB0aGUgJ0Z1bmN0aW9uJyBjb25zdHJ1Y3RvcgpJbmRleDogSlNUZXN0cy9taWNyb2JlbmNobWFy a3MvY29uc3RydWN0LXBvbHktcHJvdG8tb2JqZWN0LmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMv bWljcm9iZW5jaG1hcmtzL2NvbnN0cnVjdC1wb2x5LXByb3RvLW9iamVjdC5qcwkobm9uZXhpc3Rl bnQpCisrKyBKU1Rlc3RzL21pY3JvYmVuY2htYXJrcy9jb25zdHJ1Y3QtcG9seS1wcm90by1vYmpl Y3QuanMJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwyMSBAQAorZnVuY3Rpb24gZm9vKCkgewor ICAgIGNsYXNzIEEgeworICAgICAgICBjb25zdHJ1Y3RvcigpIHsKKyAgICAgICAgICAgIHRoaXMu eCA9IDI1OworICAgICAgICAgICAgdGhpcy55ID0gMzA7CisgICAgICAgIH0KKyAgICB9OworICAg IHJldHVybiBBOworfQorbGV0IEEgPSBmb28oKTsKK2xldCBCID0gZm9vKCk7Citub0lubGluZShB KTsKK25vSW5saW5lKEIpOworCitmb3IgKGxldCBpID0gMDsgaSA8IDQwMDAwMDsgKytpKSB7Cisg ICAgbGV0IGIgPSAhIShpICUgMik7CisgICAgaWYgKGIpCisgICAgICAgIG5ldyBBOworICAgIGVs c2UKKyAgICAgICAgbmV3IEI7Cit9CkluZGV4OiBKU1Rlc3RzL3N0cmVzcy9hbGxvY2F0aW9uLXNp bmtpbmctbmV3LW9iamVjdC13aXRoLXBvbHktcHJvdG8uanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gSlNUZXN0 cy9zdHJlc3MvYWxsb2NhdGlvbi1zaW5raW5nLW5ldy1vYmplY3Qtd2l0aC1wb2x5LXByb3RvLmpz CShub25leGlzdGVudCkKKysrIEpTVGVzdHMvc3RyZXNzL2FsbG9jYXRpb24tc2lua2luZy1uZXct b2JqZWN0LXdpdGgtcG9seS1wcm90by5qcwkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDUzIEBA CitmdW5jdGlvbiBmb28oKSB7CisgICAgY2xhc3MgQSB7CisgICAgICAgIGNvbnN0cnVjdG9yKCkg eworICAgICAgICB9CisgICAgfTsKKyAgICByZXR1cm4gQTsKK30KK2xldCBBID0gZm9vKCk7Cits ZXQgQiA9IGZvbygpOworCitmdW5jdGlvbiBtYWtlUG9seVByb3RvKG8pIHsKKyAgICByZXR1cm4g by54OworfQorbm9JbmxpbmUobWFrZVBvbHlQcm90byk7CisKK2ZvciAobGV0IGkgPSAwOyBpIDwg MTAwMDsgKytpKSB7CisgICAgbWFrZVBvbHlQcm90byhpICUgMiA/IG5ldyBBIDogbmV3IEIpOwor fQorCitmdW5jdGlvbiBiYXIoYikgeworICAgIGxldCBvID0gbmV3IEE7CisgICAgaWYgKGIpIHsK KyAgICAgICAgaWYgKGlzRmluYWxUaWVyKCkpCisgICAgICAgICAgICBPU1JFeGl0KCk7CisgICAg ICAgIHJldHVybiBvOworICAgIH0KK30KK25vSW5saW5lKGJhcik7CisKK2Z1bmN0aW9uIGJheihi KSB7CisgICAgbGV0IG8gPSBuZXcgQTsKKyAgICBpZiAoYikKKyAgICAgICAgcmV0dXJuIG87Cit9 Citub0lubGluZShiYXopOworCitmb3IgKGxldCBpID0gMDsgaSA8IDEwMDAwMDsgKytpKSB7Cisg ICAgbGV0IGIgPSBpICUgMTAgPT09IDA7CisgICAgbGV0IHIgPSBiYXIoYik7CisgICAgaWYgKGIp IHsKKyAgICAgICAgaWYgKHIuX19wcm90b19fICE9PSBBLnByb3RvdHlwZSkKKyAgICAgICAgICAg IHRocm93IG5ldyBFcnJvcigiQmFkISIpOworICAgIH0KK30KKworZm9yIChsZXQgaSA9IDA7IGkg PCAxMDAwMDA7ICsraSkgeworICAgIGxldCBiID0gaSAlIDEwID09PSAwOworICAgIGxldCByID0g YmF6KGIpOworICAgIGlmIChiKSB7CisgICAgICAgIGlmIChyLl9fcHJvdG9fXyAhPT0gQS5wcm90 b3R5cGUpCisgICAgICAgICAgICB0aHJvdyBuZXcgRXJyb3IoIkJhZCEiKTsKKyAgICB9Cit9Cklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMTE5MikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSw0OCBAQAor MjAxOC0wNS0wMSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICBE b24ndCBwcmV2ZW50IENyZWF0ZVRoaXMgYmVpbmcgZm9sZGVkIHRvIE5ld09iamVjdCB3aGVuIHRo ZSBzdHJ1Y3R1cmUgaXMgcG9seSBwcm90bworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTg1MTc3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCB0ZWFjaGVzIHRoZSBERkcvRlRMIGhvdyB0byBj b25zdGFudCBmb2xkIENyZWF0ZVRoaXMgd2l0aAorICAgICAgICBhIGtub3duIHBvbHkgcHJvdG8g U3RydWN0dXJlIHRvIE5ld09iamVjdC4gV2UgZG8gaXQgYnkgZW1pdHRpbmcgYSBOZXdPYmplY3QK KyAgICAgICAgZm9sbG93ZWQgYnkgYSBQdXRCeU9mZnNldCBmb3IgdGhlIHByb3RvdHlwZSB2YWx1 ZS4KKyAgICAgICAgCisgICAgICAgIFdlIG1ha2UgaXQgc28gdGhhdCBPYmplY3RBbGxvY2F0aW9u UHJvZmlsZSBob2xkcyB0aGUgcHJvdG90eXBlIHZhbHVlLgorICAgICAgICBUaGlzIGlzIHNvdW5k IGJlY2F1c2UgSlNGdW5jdGlvbiBjbGVhcnMgdGhhdCBwcm9maWxlIHdoZW4gaXRzICdwcm90b3R5 cGUnCisgICAgICAgIGZpZWxkIGNoYW5nZXMuCisgICAgICAgIAorICAgICAgICBUaGlzIHBhdGNo IGFsc28gcmVuYW1lcyB1bmRlcnNjb3JlUHJvdG9Qcml2YXRlTmFtZSB0byBwb2x5UHJvdG9OYW1l IHNpbmNlCisgICAgICAgIHRoYXQgbmFtZSB3YXMgbm9uc2Vuc2ljYWw6IGl0IHdhcyBvbmx5IHVz ZWQgZm9yIHBvbHkgcHJvdG8uCisgICAgICAgIAorICAgICAgICBUaGlzIGlzIGEgMnggc3BlZWR1 cCBvbiB0aGUgZ2V0X2NhbGxlZV9wb2x5bW9ycGhpYyBtaWNyb2JlbmNobWFyay4gSSBoYWQKKyAg ICAgICAgcmVncmVzc2VkIHRoYXQgYmVuY2htYXJrIHdoZW4gSSBmaXJzdCBpbnRyb2R1Y2VkIHBv bHkgcHJvdG8uCisKKyAgICAgICAgKiBidWlsdGlucy9CdWlsdGluTmFtZXMuY3BwOgorICAgICAg ICAqIGJ1aWx0aW5zL0J1aWx0aW5OYW1lcy5oOgorICAgICAgICAoSlNDOjpCdWlsdGluTmFtZXM6 OkJ1aWx0aW5OYW1lcyk6CisgICAgICAgIChKU0M6OkJ1aWx0aW5OYW1lczo6cG9seVByb3RvTmFt ZSBjb25zdCk6CisgICAgICAgIChKU0M6OkJ1aWx0aW5OYW1lczo6dW5kZXJzY29yZVByb3RvUHJp dmF0ZU5hbWUgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGJ5dGVjb2RlL09iamVjdEFsbG9j YXRpb25Qcm9maWxlLmg6CisgICAgICAgIChKU0M6Ok9iamVjdEFsbG9jYXRpb25Qcm9maWxlOjpw cm90b3R5cGUpOgorICAgICAgICAoSlNDOjpPYmplY3RBbGxvY2F0aW9uUHJvZmlsZTo6Y2xlYXIp OgorICAgICAgICAoSlNDOjpPYmplY3RBbGxvY2F0aW9uUHJvZmlsZTo6dmlzaXRBZ2dyZWdhdGUp OgorICAgICAgICAqIGJ5dGVjb2RlL09iamVjdEFsbG9jYXRpb25Qcm9maWxlSW5saW5lcy5oOgor ICAgICAgICAoSlNDOjpPYmplY3RBbGxvY2F0aW9uUHJvZmlsZTo6aW5pdGlhbGl6ZVByb2ZpbGUp OgorICAgICAgICAqIGRmZy9ERkdBYnN0cmFjdEludGVycHJldGVySW5saW5lcy5oOgorICAgICAg ICAoSlNDOjpERkc6OkFic3RyYWN0SW50ZXJwcmV0ZXI8QWJzdHJhY3RTdGF0ZVR5cGU+OjpleGVj dXRlRWZmZWN0cyk6CisgICAgICAgICogZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcDoKKyAgICAg ICAgKEpTQzo6REZHOjpCeXRlQ29kZVBhcnNlcjo6cGFyc2VCbG9jayk6CisgICAgICAgICogZGZn L0RGR0NvbnN0YW50Rm9sZGluZ1BoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpDb25zdGFu dEZvbGRpbmdQaGFzZTo6Zm9sZENvbnN0YW50cyk6CisgICAgICAgICogZGZnL0RGR09wZXJhdGlv bnMuY3BwOgorICAgICAgICAqIHJ1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNwcDoKKyAgICAgICAg KEpTQzo6U0xPV19QQVRIX0RFQ0wpOgorICAgICAgICAqIHJ1bnRpbWUvRnVuY3Rpb25SYXJlRGF0 YS5oOgorICAgICAgICAqIHJ1bnRpbWUvU3RydWN0dXJlLmNwcDoKKyAgICAgICAgKEpTQzo6U3Ry dWN0dXJlOjpjcmVhdGUpOgorCiAyMDE4LTA0LTI5ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBs ZS5jb20+CiAKICAgICAgICAgTElDTSBzaG91bGRuJ3QgaG9pc3Qgbm9kZXMgaWYgaG9pc3RlZCBu b2RlcyBleGl0ZWQgaW4gdGhhdCBjb2RlIGJsb2NrCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvYnVpbHRpbnMvQnVpbHRpbk5hbWVzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvYnVpbHRpbnMvQnVpbHRpbk5hbWVzLmNwcAkocmV2aXNpb24gMjMxMTkyKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2J1aWx0aW5zL0J1aWx0aW5OYW1lcy5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQ0LDcgKzQ0LDcgQEAgSlNDX0NPTU1PTl9QUklWQVRFX0lERU5USUZJRVJTX0VB Q0hfUFJPUAogI3VuZGVmIElOSVRJQUxJWkVfQlVJTFRJTl9QUklWQVRFX05BTUVTCiAKIFN5bWJv bEltcGw6OlN0YXRpY1N5bWJvbEltcGwgZG9sbGFyVk1Qcml2YXRlTmFtZSB7ICJQcml2YXRlU3lt Ym9sLiR2bSIsIFN5bWJvbEltcGw6OnNfZmxhZ0lzUHJpdmF0ZSB9OwotU3ltYm9sSW1wbDo6U3Rh dGljU3ltYm9sSW1wbCB1bmRlcnNjb3JlUHJvdG9Qcml2YXRlTmFtZSB7ICJQcml2YXRlU3ltYm9s Ll9fcHJvdG9fXyIsIFN5bWJvbEltcGw6OnNfZmxhZ0lzUHJpdmF0ZSB9OworU3ltYm9sSW1wbDo6 U3RhdGljU3ltYm9sSW1wbCBwb2x5UHJvdG9Qcml2YXRlTmFtZSB7ICJQcml2YXRlU3ltYm9sLlBv bHlQcm90byIsIFN5bWJvbEltcGw6OnNfZmxhZ0lzUHJpdmF0ZSB9OwogCiB9IC8vIG5hbWVzcGFj ZSBTeW1ib2xzCiB9IC8vIG5hbWVzcGFjZSBKU0MKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9idWlsdGlucy9CdWlsdGluTmFtZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlw dENvcmUvYnVpbHRpbnMvQnVpbHRpbk5hbWVzLmgJKHJldmlzaW9uIDIzMTE5MikKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9idWlsdGlucy9CdWlsdGluTmFtZXMuaAkod29ya2luZyBjb3B5KQpA QCAtMjAyLDcgKzIwMiw3IEBAIEpTQ19DT01NT05fUFJJVkFURV9JREVOVElGSUVSU19FQUNIX1BS T1AKICN1bmRlZiBERUNMQVJFX0JVSUxUSU5fUFJJVkFURV9OQU1FUwogCiBleHRlcm4gU3ltYm9s SW1wbDo6U3RhdGljU3ltYm9sSW1wbCBkb2xsYXJWTVByaXZhdGVOYW1lOwotZXh0ZXJuIFN5bWJv bEltcGw6OlN0YXRpY1N5bWJvbEltcGwgdW5kZXJzY29yZVByb3RvUHJpdmF0ZU5hbWU7CitleHRl cm4gU3ltYm9sSW1wbDo6U3RhdGljU3ltYm9sSW1wbCBwb2x5UHJvdG9Qcml2YXRlTmFtZTsKIH0K IAogI2RlZmluZSBJTklUSUFMSVpFX1BSSVZBVEVfVE9fUFVCTElDX0VOVFJZKG5hbWUpIG1fcHJp dmF0ZVRvUHVibGljTWFwLmFkZChtXyMjbmFtZSMjUHJpdmF0ZU5hbWUuaW1wbCgpLCAmbV8jI25h bWUpOwpAQCAtMjI3LDcgKzIyNyw3IEBAIHB1YmxpYzoKICAgICAgICAgSlNDX0NPTU1PTl9QUklW QVRFX0lERU5USUZJRVJTX0VBQ0hfV0VMTF9LTk9XTl9TWU1CT0woSU5JVElBTElaRV9CVUlMVElO X1NZTUJPTFMpCiAgICAgICAgICwgbV9kb2xsYXJWTU5hbWUoSWRlbnRpZmllcjo6ZnJvbVN0cmlu Zyh2bSwgIiR2bSIpKQogICAgICAgICAsIG1fZG9sbGFyVk1Qcml2YXRlTmFtZShJZGVudGlmaWVy Ojpmcm9tVWlkKHZtLCAmc3RhdGljX2Nhc3Q8U3ltYm9sSW1wbCY+KFN5bWJvbHM6OmRvbGxhclZN UHJpdmF0ZU5hbWUpKSkKLSAgICAgICAgLCBtX3VuZGVyc2NvcmVQcm90b1ByaXZhdGVOYW1lKElk ZW50aWZpZXI6OmZyb21VaWQodm0sICZzdGF0aWNfY2FzdDxTeW1ib2xJbXBsJj4oU3ltYm9sczo6 dW5kZXJzY29yZVByb3RvUHJpdmF0ZU5hbWUpKSkKKyAgICAgICAgLCBtX3BvbHlQcm90b1ByaXZh dGVOYW1lKElkZW50aWZpZXI6OmZyb21VaWQodm0sICZzdGF0aWNfY2FzdDxTeW1ib2xJbXBsJj4o U3ltYm9sczo6cG9seVByb3RvUHJpdmF0ZU5hbWUpKSkKICAgICB7CiAgICAgICAgIEpTQ19GT1JF QUNIX0JVSUxUSU5fRlVOQ1RJT05fTkFNRShJTklUSUFMSVpFX1BSSVZBVEVfVE9fUFVCTElDX0VO VFJZKQogICAgICAgICBKU0NfQ09NTU9OX1BSSVZBVEVfSURFTlRJRklFUlNfRUFDSF9QUk9QRVJU WV9OQU1FKElOSVRJQUxJWkVfUFJJVkFURV9UT19QVUJMSUNfRU5UUlkpCkBAIC0yMzYsOCArMjM2 LDYgQEAgcHVibGljOgogICAgICAgICBKU0NfQ09NTU9OX1BSSVZBVEVfSURFTlRJRklFUlNfRUFD SF9XRUxMX0tOT1dOX1NZTUJPTChJTklUSUFMSVpFX1NZTUJPTF9QVUJMSUNfVE9fUFJJVkFURV9F TlRSWSkKICAgICAgICAgbV9wcml2YXRlVG9QdWJsaWNNYXAuYWRkKG1fZG9sbGFyVk1Qcml2YXRl TmFtZS5pbXBsKCksICZtX2RvbGxhclZNTmFtZSk7CiAgICAgICAgIG1fcHVibGljVG9Qcml2YXRl TWFwLmFkZChtX2RvbGxhclZNTmFtZS5pbXBsKCksICZtX2RvbGxhclZNUHJpdmF0ZU5hbWUpOwot ICAgICAgICBtX3ByaXZhdGVUb1B1YmxpY01hcC5hZGQobV91bmRlcnNjb3JlUHJvdG9Qcml2YXRl TmFtZS5pbXBsKCksICZjb21tb25JZGVudGlmaWVycy0+dW5kZXJzY29yZVByb3RvKTsKLSAgICAg ICAgbV9wdWJsaWNUb1ByaXZhdGVNYXAuYWRkKGNvbW1vbklkZW50aWZpZXJzLT51bmRlcnNjb3Jl UHJvdG8uaW1wbCgpLCAmbV91bmRlcnNjb3JlUHJvdG9Qcml2YXRlTmFtZSk7CiAgICAgfQogCiAg ICAgY29uc3QgSWRlbnRpZmllciogbG9va1VwUHJpdmF0ZU5hbWUoY29uc3QgSWRlbnRpZmllciYp IGNvbnN0OwpAQCAtMjUwLDcgKzI0OCw3IEBAIHB1YmxpYzoKICAgICBKU0NfQ09NTU9OX1BSSVZB VEVfSURFTlRJRklFUlNfRUFDSF9XRUxMX0tOT1dOX1NZTUJPTChERUNMQVJFX0JVSUxUSU5fU1lN Qk9MX0FDQ0VTU09SKQogICAgIGNvbnN0IEpTQzo6SWRlbnRpZmllciYgZG9sbGFyVk1QdWJsaWNO YW1lKCkgY29uc3QgeyByZXR1cm4gbV9kb2xsYXJWTU5hbWU7IH0KICAgICBjb25zdCBKU0M6Oklk ZW50aWZpZXImIGRvbGxhclZNUHJpdmF0ZU5hbWUoKSBjb25zdCB7IHJldHVybiBtX2RvbGxhclZN UHJpdmF0ZU5hbWU7IH0KLSAgICBjb25zdCBKU0M6OklkZW50aWZpZXImIHVuZGVyc2NvcmVQcm90 b1ByaXZhdGVOYW1lKCkgY29uc3QgeyByZXR1cm4gbV91bmRlcnNjb3JlUHJvdG9Qcml2YXRlTmFt ZTsgfQorICAgIGNvbnN0IEpTQzo6SWRlbnRpZmllciYgcG9seVByb3RvTmFtZSgpIGNvbnN0IHsg cmV0dXJuIG1fcG9seVByb3RvUHJpdmF0ZU5hbWU7IH0KIAogcHJpdmF0ZToKICAgICBJZGVudGlm aWVyIG1fZW1wdHlJZGVudGlmaWVyOwpAQCAtMjU5LDcgKzI1Nyw3IEBAIHByaXZhdGU6CiAgICAg SlNDX0NPTU1PTl9QUklWQVRFX0lERU5USUZJRVJTX0VBQ0hfV0VMTF9LTk9XTl9TWU1CT0woREVD TEFSRV9CVUlMVElOX1NZTUJPTFMpCiAgICAgY29uc3QgSlNDOjpJZGVudGlmaWVyIG1fZG9sbGFy Vk1OYW1lOwogICAgIGNvbnN0IEpTQzo6SWRlbnRpZmllciBtX2RvbGxhclZNUHJpdmF0ZU5hbWU7 Ci0gICAgY29uc3QgSlNDOjpJZGVudGlmaWVyIG1fdW5kZXJzY29yZVByb3RvUHJpdmF0ZU5hbWU7 CisgICAgY29uc3QgSlNDOjpJZGVudGlmaWVyIG1fcG9seVByb3RvUHJpdmF0ZU5hbWU7CiAgICAg dHlwZWRlZiBIYXNoTWFwPFJlZlB0cjxVbmlxdWVkU3RyaW5nSW1wbD4sIGNvbnN0IElkZW50aWZp ZXIqLCBJZGVudGlmaWVyUmVwSGFzaD4gQnVpbHRpbk5hbWVzTWFwOwogICAgIEJ1aWx0aW5OYW1l c01hcCBtX3B1YmxpY1RvUHJpdmF0ZU1hcDsKICAgICBCdWlsdGluTmFtZXNNYXAgbV9wcml2YXRl VG9QdWJsaWNNYXA7CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvYnl0ZWNvZGUvT2JqZWN0 QWxsb2NhdGlvblByb2ZpbGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv Ynl0ZWNvZGUvT2JqZWN0QWxsb2NhdGlvblByb2ZpbGUuaAkocmV2aXNpb24gMjMxMTkyKQorKysg U291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL09iamVjdEFsbG9jYXRpb25Qcm9maWxlLmgJ KHdvcmtpbmcgY29weSkKQEAgLTU4LDEyICs1OCwyMCBAQCBwdWJsaWM6CiAgICAgICAgIFdURjo6 bG9hZExvYWRGZW5jZSgpOwogICAgICAgICByZXR1cm4gc3RydWN0dXJlOwogICAgIH0KKyAgICBK U09iamVjdCogcHJvdG90eXBlKCkKKyAgICB7CisgICAgICAgIEpTT2JqZWN0KiBwcm90b3R5cGUg PSBtX3Byb3RvdHlwZS5nZXQoKTsKKyAgICAgICAgV1RGOjpsb2FkTG9hZEZlbmNlKCk7CisgICAg ICAgIHJldHVybiBwcm90b3R5cGU7CisgICAgfQogICAgIHVuc2lnbmVkIGlubGluZUNhcGFjaXR5 KCkgeyByZXR1cm4gbV9pbmxpbmVDYXBhY2l0eTsgfQogCisKICAgICB2b2lkIGNsZWFyKCkKICAg ICB7CiAgICAgICAgIG1fYWxsb2NhdG9yID0gQWxsb2NhdG9yKCk7CiAgICAgICAgIG1fc3RydWN0 dXJlLmNsZWFyKCk7CisgICAgICAgIG1fcHJvdG90eXBlLmNsZWFyKCk7CiAgICAgICAgIG1faW5s aW5lQ2FwYWNpdHkgPSAwOwogICAgICAgICBBU1NFUlQoaXNOdWxsKCkpOwogICAgIH0KQEAgLTcx LDYgKzc5LDcgQEAgcHVibGljOgogICAgIHZvaWQgdmlzaXRBZ2dyZWdhdGUoU2xvdFZpc2l0b3Im IHZpc2l0b3IpCiAgICAgewogICAgICAgICB2aXNpdG9yLmFwcGVuZChtX3N0cnVjdHVyZSk7Cisg ICAgICAgIHZpc2l0b3IuYXBwZW5kKG1fcHJvdG90eXBlKTsKICAgICB9CiAKIHByaXZhdGU6CkBA IC03OCw2ICs4Nyw3IEBAIHByaXZhdGU6CiAKICAgICBBbGxvY2F0b3IgbV9hbGxvY2F0b3I7IC8v IFByZWNvbXB1dGVkIHRvIG1ha2UgdGhpbmdzIGVhc2llciBmb3IgZ2VuZXJhdGVkIGNvZGUuCiAg ICAgV3JpdGVCYXJyaWVyPFN0cnVjdHVyZT4gbV9zdHJ1Y3R1cmU7CisgICAgV3JpdGVCYXJyaWVy PEpTT2JqZWN0PiBtX3Byb3RvdHlwZTsKICAgICB1bnNpZ25lZCBtX2lubGluZUNhcGFjaXR5Owog fTsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL09iamVjdEFsbG9jYXRp b25Qcm9maWxlSW5saW5lcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9i eXRlY29kZS9PYmplY3RBbGxvY2F0aW9uUHJvZmlsZUlubGluZXMuaAkocmV2aXNpb24gMjMxMTky KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL09iamVjdEFsbG9jYXRpb25Qcm9m aWxlSW5saW5lcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNSwxMSArMzUsMTIgQEAgQUxXQVlTX0lO TElORSB2b2lkIE9iamVjdEFsbG9jYXRpb25Qcm9maQogewogICAgIEFTU0VSVCghbV9hbGxvY2F0 b3IpOwogICAgIEFTU0VSVCghbV9zdHJ1Y3R1cmUpOworICAgIEFTU0VSVCghbV9wcm90b3R5cGUp OwogICAgIEFTU0VSVCghbV9pbmxpbmVDYXBhY2l0eSk7CiAKLSAgICAvLyBGSVhNRTogV2hlbiBn b2luZyBwb2x5IHByb3RvLCB3ZSBzaG91bGQgbWFrZSBhbiBhbGxvY2F0b3IgYW5kIHRlYWNoCi0g ICAgLy8gY3JlYXRlX3RoaXMnIGZhc3QgcGF0aCBob3cgdG8gYWxsb2NhdGUgYSBwb2x5IHByb3Rv IG9iamVjdC4KLSAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc3NTE3CisgICAgLy8gRklYTUU6IFRlYWNoIGNyZWF0ZV90aGlzJ3MgZmFzdCBwYXRoIGhvdyB0 byBhbGxvY2F0ZSBwb2x5CisgICAgLy8gcHJvdG8gb2JqZWN0czogaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzUxNworCiAgICAgYm9vbCBpc1BvbHlQcm90byA9IGZh bHNlOwogICAgIEZ1bmN0aW9uRXhlY3V0YWJsZSogZXhlY3V0YWJsZSA9IG51bGxwdHI7CiAgICAg aWYgKGNvbnN0cnVjdG9yKSB7CkBAIC01NSw2ICs1Niw3IEBAIEFMV0FZU19JTkxJTkUgdm9pZCBP YmplY3RBbGxvY2F0aW9uUHJvZmkKICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKHN0cnVjdHVy ZS0+dHlwZUluZm8oKS50eXBlKCkgPT0gRmluYWxPYmplY3RUeXBlKTsKICAgICAgICAgICAgIG1f YWxsb2NhdG9yID0gQWxsb2NhdG9yKCk7CiAgICAgICAgICAgICBtX3N0cnVjdHVyZS5zZXQodm0s IG93bmVyLCBzdHJ1Y3R1cmUpOworICAgICAgICAgICAgbV9wcm90b3R5cGUuc2V0KHZtLCBvd25l ciwgcHJvdG90eXBlKTsKICAgICAgICAgICAgIG1faW5saW5lQ2FwYWNpdHkgPSBzdHJ1Y3R1cmUt PmlubGluZUNhcGFjaXR5KCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTEz MiwxMCArMTM0LDExIEBAIEFMV0FZU19JTkxJTkUgdm9pZCBPYmplY3RBbGxvY2F0aW9uUHJvZmkK ICAgICAgICAgbV9hbGxvY2F0b3IgPSBhbGxvY2F0b3I7CiAgICAgfQogCi0gICAgLy8gRW5zdXJl IHRoYXQgaWYgYW5vdGhlciB0aHJlYWQgc2VlcyB0aGUgc3RydWN0dXJlLCBpdCB3aWxsIHNlZSBp dCBwcm9wZXJseSBjcmVhdGVkCisgICAgLy8gRW5zdXJlIHRoYXQgaWYgYW5vdGhlciB0aHJlYWQg c2VlcyB0aGUgc3RydWN0dXJlIGFuZCBwcm90b3R5cGUsIGl0IHdpbGwgc2VlIGl0IHByb3Blcmx5 IGNyZWF0ZWQuCiAgICAgV1RGOjpzdG9yZVN0b3JlRmVuY2UoKTsKIAogICAgIG1fc3RydWN0dXJl LnNldCh2bSwgb3duZXIsIHN0cnVjdHVyZSk7CisgICAgbV9wcm90b3R5cGUuc2V0KHZtLCBvd25l ciwgcHJvdG90eXBlKTsKICAgICBtX2lubGluZUNhcGFjaXR5ID0gaW5saW5lQ2FwYWNpdHk7CiB9 CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRl cklubGluZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Fi c3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgJKHJldmlzaW9uIDIzMTE5MikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHQWJzdHJhY3RJbnRlcnByZXRlcklubGluZXMuaAkod29ya2lu ZyBjb3B5KQpAQCAtMjMxNCwxNiArMjMxNCwxMiBAQCBib29sIEFic3RyYWN0SW50ZXJwcmV0ZXI8 QWJzdHJhY3RTdGF0ZVR5CiAgICAgICAgICAgICBpZiAoYXV0byogZnVuY3Rpb24gPSBqc0R5bmFt aWNDYXN0PEpTRnVuY3Rpb24qPihtX3ZtLCBiYXNlKSkgewogICAgICAgICAgICAgICAgIGlmIChG dW5jdGlvblJhcmVEYXRhKiByYXJlRGF0YSA9IGZ1bmN0aW9uLT5yYXJlRGF0YSgpKSB7CiAgICAg ICAgICAgICAgICAgICAgIGlmIChTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IHJhcmVEYXRhLT5vYmpl Y3RBbGxvY2F0aW9uU3RydWN0dXJlKCkpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIC8vIEZJ WE1FOiB3ZSBzaG91bGQgYmUgYWJsZSB0byBhbGxvY2F0ZSBhIHBvbHkgcHJvdG8gb2JqZWN0IGhl cmU6Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc3NTE3Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoc3RydWN0 dXJlLT5oYXNNb25vUHJvdG8oKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZ3Jh cGguZnJlZXplKHJhcmVEYXRhKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX2dyYXBo LndhdGNocG9pbnRzKCkuYWRkTGF6aWx5KHJhcmVEYXRhLT5hbGxvY2F0aW9uUHJvZmlsZVdhdGNo cG9pbnRTZXQoKSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9zdGF0ZS5zZXRGb3Vu ZENvbnN0YW50cyh0cnVlKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBkaWRGb2xkQ2xv YmJlcldvcmxkKCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgZm9yTm9kZShub2RlKS5z ZXQobV9ncmFwaCwgc3RydWN0dXJlKTsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVh azsKLSAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIG1f Z3JhcGguZnJlZXplKHJhcmVEYXRhKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fZ3JhcGgu d2F0Y2hwb2ludHMoKS5hZGRMYXppbHkocmFyZURhdGEtPmFsbG9jYXRpb25Qcm9maWxlV2F0Y2hw b2ludFNldCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIG1fc3RhdGUuc2V0Rm91bmRDb25z dGFudHModHJ1ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICBkaWRGb2xkQ2xvYmJlcldvcmxk KCk7CisgICAgICAgICAgICAgICAgICAgICAgICBmb3JOb2RlKG5vZGUpLnNldChtX2dyYXBoLCBz dHJ1Y3R1cmUpOworICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CkluZGV4OiBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0J5dGVDb2RlUGFyc2VyLmNwcAkocmV2aXNpb24g MjMxMTkyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdCeXRlQ29kZVBhcnNlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJBcml0aFByb2Zp bGUuaCIKICNpbmNsdWRlICJBcnJheUNvbnN0cnVjdG9yLmgiCiAjaW5jbHVkZSAiQmFzaWNCbG9j a0xvY2F0aW9uLmgiCisjaW5jbHVkZSAiQnVpbHRpbk5hbWVzLmgiCiAjaW5jbHVkZSAiQnl0ZWNv ZGVTdHJ1Y3RzLmgiCiAjaW5jbHVkZSAiQ2FsbExpbmtTdGF0dXMuaCIKICNpbmNsdWRlICJDb2Rl QmxvY2suaCIKQEAgLTQ0NjcsMTUgKzQ0NjgsMjkgQEAgdm9pZCBCeXRlQ29kZVBhcnNlcjo6cGFy c2VCbG9jayh1bnNpZ25lZAogICAgICAgICAgICAgYm9vbCBhbHJlYWR5RW1pdHRlZCA9IGZhbHNl OwogICAgICAgICAgICAgaWYgKGZ1bmN0aW9uKSB7CiAgICAgICAgICAgICAgICAgaWYgKEZ1bmN0 aW9uUmFyZURhdGEqIHJhcmVEYXRhID0gZnVuY3Rpb24tPnJhcmVEYXRhKCkpIHsKLSAgICAgICAg ICAgICAgICAgICAgaWYgKFN0cnVjdHVyZSogc3RydWN0dXJlID0gcmFyZURhdGEtPm9iamVjdEFs bG9jYXRpb25TdHJ1Y3R1cmUoKSkgewotICAgICAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6 IHdlIHNob3VsZCBiZSBhYmxlIHRvIGFsbG9jYXRlIGEgcG9seSBwcm90byBvYmplY3QgaGVyZToK LSAgICAgICAgICAgICAgICAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNzc1MTcKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzdHJ1Y3R1cmUt Pmhhc01vbm9Qcm90bygpKSB7CisgICAgICAgICAgICAgICAgICAgIGlmIChyYXJlRGF0YS0+YWxs b2NhdGlvblByb2ZpbGVXYXRjaHBvaW50U2V0KCkuaXNTdGlsbFZhbGlkKCkpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gcmFyZURhdGEtPm9iamVjdEFs bG9jYXRpb25TdHJ1Y3R1cmUoKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIEpTT2JqZWN0KiBw cm90b3R5cGUgPSByYXJlRGF0YS0+b2JqZWN0QWxsb2NhdGlvblByb3RvdHlwZSgpOworICAgICAg ICAgICAgICAgICAgICAgICAgaWYgKHN0cnVjdHVyZQorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICYmIChzdHJ1Y3R1cmUtPmhhc01vbm9Qcm90bygpIHx8IHByb3RvdHlwZSkKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAmJiByYXJlRGF0YS0+YWxsb2NhdGlvblByb2ZpbGVXYXRjaHBv aW50U2V0KCkuaXNTdGlsbFZhbGlkKCkpIHsKKwogICAgICAgICAgICAgICAgICAgICAgICAgICAg IG1fZ3JhcGguZnJlZXplKHJhcmVEYXRhKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBt X2dyYXBoLndhdGNocG9pbnRzKCkuYWRkTGF6aWx5KHJhcmVEYXRhLT5hbGxvY2F0aW9uUHJvZmls ZVdhdGNocG9pbnRTZXQoKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gVGhlIGNh bGxlZSBpcyBzdGlsbCBsaXZlIHVwIHRvIHRoaXMgcG9pbnQuCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgYWRkVG9HcmFwaChQaGFudG9tLCBjYWxsZWUpOwotICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHNldChWaXJ0dWFsUmVnaXN0ZXIoYnl0ZWNvZGUuZHN0KCkpLCBhZGRUb0dyYXBo KE5ld09iamVjdCwgT3BJbmZvKG1fZ3JhcGgucmVnaXN0ZXJTdHJ1Y3R1cmUoc3RydWN0dXJlKSkp KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBOb2RlKiBvYmplY3QgPSBhZGRUb0dyYXBo KE5ld09iamVjdCwgT3BJbmZvKG1fZ3JhcGgucmVnaXN0ZXJTdHJ1Y3R1cmUoc3RydWN0dXJlKSkp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChzdHJ1Y3R1cmUtPmhhc1BvbHlQcm90 bygpKSB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFN0b3JhZ2VBY2Nlc3NEYXRh KiBkYXRhID0gbV9ncmFwaC5tX3N0b3JhZ2VBY2Nlc3NEYXRhLmFkZCgpOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBkYXRhLT5vZmZzZXQgPSBrbm93blBvbHlQcm90b09mZnNldDsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YS0+aWRlbnRpZmllck51bWJlciA9 IG1fZ3JhcGguaWRlbnRpZmllcnMoKS5lbnN1cmUobV9ncmFwaC5tX3ZtLnByb3BlcnR5TmFtZXMt PmJ1aWx0aW5OYW1lcygpLnBvbHlQcm90b05hbWUoKS5pbXBsKCkpOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBJbmZlcnJlZFR5cGU6OkRlc2NyaXB0b3IgaW5mZXJyZWRUeXBlID0g SW5mZXJyZWRUeXBlOjpUb3A7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGEt PmluZmVycmVkVHlwZSA9IGluZmVycmVkVHlwZTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbV9ncmFwaC5yZWdpc3RlckluZmVycmVkVHlwZShpbmZlcnJlZFR5cGUpOworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBBU1NFUlQoaXNJbmxpbmVPZmZzZXQoa25vd25Qb2x5 UHJvdG9PZmZzZXQpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYWRkVG9HcmFw aChQdXRCeU9mZnNldCwgT3BJbmZvKGRhdGEpLCBvYmplY3QsIG9iamVjdCwgd2Vha0pTQ29uc3Rh bnQocHJvdG90eXBlKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHNldChWaXJ0dWFsUmVnaXN0ZXIoYnl0ZWNvZGUuZHN0KCkpLCBv YmplY3QpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFscmVhZHlFbWl0dGVkID0gdHJ1 ZTsKICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgfQpJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb25zdGFudEZvbGRpbmdQaGFzZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDb25zdGFudEZvbGRp bmdQaGFzZS5jcHAJKHJldmlzaW9uIDIzMTE5MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9k ZmcvREZHQ29uc3RhbnRGb2xkaW5nUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsy OCw3IEBACiAKICNpZiBFTkFCTEUoREZHX0pJVCkKIAorI2luY2x1ZGUgIkJ1aWx0aW5OYW1lcy5o IgogI2luY2x1ZGUgIkRGR0Fic3RyYWN0SW50ZXJwcmV0ZXJJbmxpbmVzLmgiCiAjaW5jbHVkZSAi REZHQXJndW1lbnRzVXRpbGl0aWVzLmgiCiAjaW5jbHVkZSAiREZHQmFzaWNCbG9ja0lubGluZXMu aCIKQEAgLTY0MiwxNSArNjQzLDM3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgaWYgKEpT VmFsdWUgYmFzZSA9IG1fc3RhdGUuZm9yTm9kZShub2RlLT5jaGlsZDEoKSkubV92YWx1ZSkgewog ICAgICAgICAgICAgICAgICAgICBpZiAoYXV0byogZnVuY3Rpb24gPSBqc0R5bmFtaWNDYXN0PEpT RnVuY3Rpb24qPihtX2dyYXBoLm1fdm0sIGJhc2UpKSB7CiAgICAgICAgICAgICAgICAgICAgICAg ICBpZiAoRnVuY3Rpb25SYXJlRGF0YSogcmFyZURhdGEgPSBmdW5jdGlvbi0+cmFyZURhdGEoKSkg ewotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9 IHJhcmVEYXRhLT5vYmplY3RBbGxvY2F0aW9uU3RydWN0dXJlKCkpIHsKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IHdlIHNob3VsZCBiZSBhYmxlIHRvIGFsbG9jYXRl IGEgcG9seSBwcm90byBvYmplY3QgaGVyZToKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NzUxNwotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc3RydWN0dXJlLT5oYXNNb25vUHJvdG8o KSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChyYXJlRGF0YS0+YWxsb2NhdGlv blByb2ZpbGVXYXRjaHBvaW50U2V0KCkuaXNTdGlsbFZhbGlkKCkpIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgU3RydWN0dXJlKiBzdHJ1Y3R1cmUgPSByYXJlRGF0YS0+b2JqZWN0 QWxsb2NhdGlvblN0cnVjdHVyZSgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBK U09iamVjdCogcHJvdG90eXBlID0gcmFyZURhdGEtPm9iamVjdEFsbG9jYXRpb25Qcm90b3R5cGUo KTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKHN0cnVjdHVyZQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJiYgKHN0cnVjdHVyZS0+aGFzTW9ub1Byb3Rv KCkgfHwgcHJvdG90eXBlKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJiYg cmFyZURhdGEtPmFsbG9jYXRpb25Qcm9maWxlV2F0Y2hwb2ludFNldCgpLmlzU3RpbGxWYWxpZCgp KSB7CisKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZ3JhcGguZnJlZXpl KHJhcmVEYXRhKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fZ3JhcGgu d2F0Y2hwb2ludHMoKS5hZGRMYXppbHkocmFyZURhdGEtPmFsbG9jYXRpb25Qcm9maWxlV2F0Y2hw b2ludFNldCgpKTsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUtPmNv bnZlcnRUb05ld09iamVjdChtX2dyYXBoLnJlZ2lzdGVyU3RydWN0dXJlKHN0cnVjdHVyZSkpOwor CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAoc3RydWN0dXJlLT5oYXNQ b2x5UHJvdG8oKSkgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFN0 b3JhZ2VBY2Nlc3NEYXRhKiBkYXRhID0gbV9ncmFwaC5tX3N0b3JhZ2VBY2Nlc3NEYXRhLmFkZCgp OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGEtPm9mZnNldCA9 IGtub3duUG9seVByb3RvT2Zmc2V0OworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGRhdGEtPmlkZW50aWZpZXJOdW1iZXIgPSBtX2dyYXBoLmlkZW50aWZpZXJzKCkuZW5z dXJlKG1fZ3JhcGgubV92bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS5wb2x5UHJvdG9O YW1lKCkuaW1wbCgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBJ bmZlcnJlZFR5cGU6OkRlc2NyaXB0b3IgaW5mZXJyZWRUeXBlID0gSW5mZXJyZWRUeXBlOjpUb3A7 CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGF0YS0+aW5mZXJyZWRU eXBlID0gaW5mZXJyZWRUeXBlOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG1fZ3JhcGgucmVnaXN0ZXJJbmZlcnJlZFR5cGUoaW5mZXJyZWRUeXBlKTsKKworICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE5vZGVPcmlnaW4gb3JpZ2luID0gbm9k ZS0+b3JpZ2luLndpdGhJbnZhbGlkRXhpdCgpOworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIE5vZGUqIHByb3RvdHlwZU5vZGUgPSBtX2luc2VydGlvblNldC5pbnNlcnRD b25zdGFudCgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5k ZXhJbkJsb2NrICsgMSwgb3JpZ2luLCBtX2dyYXBoLmZyZWV6ZShwcm90b3R5cGUpKTsKKworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFTU0VSVChpc0lubGluZU9mZnNl dChrbm93blBvbHlQcm90b09mZnNldCkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG1faW5zZXJ0aW9uU2V0Lmluc2VydE5vZGUoCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGluZGV4SW5CbG9jayArIDEsIFNwZWNOb25lLCBQdXRC eU9mZnNldCwgb3JpZ2luLCBPcEluZm8oZGF0YSksCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIEVkZ2Uobm9kZSwgS25vd25DZWxsVXNlKSwgRWRnZShub2RlLCBL bm93bkNlbGxVc2UpLCBFZGdlKHByb3RvdHlwZU5vZGUsIFVudHlwZWRVc2UpKTsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNoYW5nZWQgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYnJlYWs7CisKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICAgICAgICAgIH0KSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT3BlcmF0aW9ucy5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAkocmV2aXNpb24g MjMxMTkyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPcGVyYXRpb25zLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMjUwLDEwICsyNTAsMTIgQEAgSlNDZWxsKiBKSVRfT1BFUkFUSU9O IG9wZXJhdGlvbkNyZWF0ZVRoaQogICAgIGlmIChjb25zdHJ1Y3Rvci0+dHlwZSgpID09IEpTRnVu Y3Rpb25UeXBlICYmIGpzQ2FzdDxKU0Z1bmN0aW9uKj4oY29uc3RydWN0b3IpLT5jYW5Vc2VBbGxv Y2F0aW9uUHJvZmlsZSgpKSB7CiAgICAgICAgIGF1dG8gcmFyZURhdGEgPSBqc0Nhc3Q8SlNGdW5j dGlvbio+KGNvbnN0cnVjdG9yKS0+ZW5zdXJlUmFyZURhdGFBbmRBbGxvY2F0aW9uUHJvZmlsZShl eGVjLCBpbmxpbmVDYXBhY2l0eSk7CiAgICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUs IG51bGxwdHIpOwotICAgICAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IHJhcmVEYXRhLT5vYmpl Y3RBbGxvY2F0aW9uUHJvZmlsZSgpLT5zdHJ1Y3R1cmUoKTsKKyAgICAgICAgT2JqZWN0QWxsb2Nh dGlvblByb2ZpbGUqIGFsbG9jYXRpb25Qcm9maWxlID0gcmFyZURhdGEtPm9iamVjdEFsbG9jYXRp b25Qcm9maWxlKCk7CisgICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gYWxsb2NhdGlvblBy b2ZpbGUtPnN0cnVjdHVyZSgpOwogICAgICAgICBKU09iamVjdCogcmVzdWx0ID0gY29uc3RydWN0 RW1wdHlPYmplY3QoZXhlYywgc3RydWN0dXJlKTsKICAgICAgICAgaWYgKHN0cnVjdHVyZS0+aGFz UG9seVByb3RvKCkpIHsKLSAgICAgICAgICAgIEpTT2JqZWN0KiBwcm90b3R5cGUgPSBqc0Nhc3Q8 SlNGdW5jdGlvbio+KGNvbnN0cnVjdG9yKS0+cHJvdG90eXBlRm9yQ29uc3RydWN0aW9uKHZtLCBl eGVjKTsKKyAgICAgICAgICAgIEpTT2JqZWN0KiBwcm90b3R5cGUgPSBhbGxvY2F0aW9uUHJvZmls ZS0+cHJvdG90eXBlKCk7CisgICAgICAgICAgICBBU1NFUlQocHJvdG90eXBlID09IGpzQ2FzdDxK U0Z1bmN0aW9uKj4oY29uc3RydWN0b3IpLT5wcm90b3R5cGVGb3JDb25zdHJ1Y3Rpb24odm0sIGV4 ZWMpKTsKICAgICAgICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBrbm93blBvbHlQcm90b09m ZnNldCwgcHJvdG90eXBlKTsKICAgICAgICAgICAgIHByb3RvdHlwZS0+ZGlkQmVjb21lUHJvdG90 eXBlKCk7CiAgICAgICAgICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFoYXNJbmRleGVkUHJvcGVy dGllcyhyZXN1bHQtPmluZGV4aW5nVHlwZSgpKSwgIldlIHJlbHkgb24gSlNGaW5hbE9iamVjdCBu b3Qgc3RhcnRpbmcgb3V0IHdpdGggYW4gaW5kZXhpbmcgdHlwZSBvdGhlcndpc2Ugd2Ugd291bGQg cG90ZW50aWFsbHkgbmVlZCB0byBjb252ZXJ0IHRvIHNsb3cgcHV0IHN0b3JhZ2UiKTsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNw cAkocmV2aXNpb24gMjMxMTkyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29t bW9uU2xvd1BhdGhzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjI0LDEwICsyMjQsMTIgQEAgU0xP V19QQVRIX0RFQ0woc2xvd19wYXRoX2NyZWF0ZV90aGlzKQogICAgICAgICAgICAgY2FjaGVkQ2Fs bGVlLnNldFdpdGhvdXRXcml0ZUJhcnJpZXIoSlNDZWxsOjpzZWVuTXVsdGlwbGVDYWxsZWVPYmpl Y3RzKCkpOwogCiAgICAgICAgIHNpemVfdCBpbmxpbmVDYXBhY2l0eSA9IGJ5dGVjb2RlLmlubGlu ZUNhcGFjaXR5KCk7Ci0gICAgICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gY29uc3RydWN0b3It PmVuc3VyZVJhcmVEYXRhQW5kQWxsb2NhdGlvblByb2ZpbGUoZXhlYywgaW5saW5lQ2FwYWNpdHkp LT5vYmplY3RBbGxvY2F0aW9uUHJvZmlsZSgpLT5zdHJ1Y3R1cmUoKTsKKyAgICAgICAgT2JqZWN0 QWxsb2NhdGlvblByb2ZpbGUqIGFsbG9jYXRpb25Qcm9maWxlID0gY29uc3RydWN0b3ItPmVuc3Vy ZVJhcmVEYXRhQW5kQWxsb2NhdGlvblByb2ZpbGUoZXhlYywgaW5saW5lQ2FwYWNpdHkpLT5vYmpl Y3RBbGxvY2F0aW9uUHJvZmlsZSgpOworICAgICAgICBTdHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IGFs bG9jYXRpb25Qcm9maWxlLT5zdHJ1Y3R1cmUoKTsKICAgICAgICAgcmVzdWx0ID0gY29uc3RydWN0 RW1wdHlPYmplY3QoZXhlYywgc3RydWN0dXJlKTsKICAgICAgICAgaWYgKHN0cnVjdHVyZS0+aGFz UG9seVByb3RvKCkpIHsKLSAgICAgICAgICAgIEpTT2JqZWN0KiBwcm90b3R5cGUgPSBjb25zdHJ1 Y3Rvci0+cHJvdG90eXBlRm9yQ29uc3RydWN0aW9uKHZtLCBleGVjKTsKKyAgICAgICAgICAgIEpT T2JqZWN0KiBwcm90b3R5cGUgPSBhbGxvY2F0aW9uUHJvZmlsZS0+cHJvdG90eXBlKCk7CisgICAg ICAgICAgICBBU1NFUlQocHJvdG90eXBlID09IGNvbnN0cnVjdG9yLT5wcm90b3R5cGVGb3JDb25z dHJ1Y3Rpb24odm0sIGV4ZWMpKTsKICAgICAgICAgICAgIHJlc3VsdC0+cHV0RGlyZWN0KHZtLCBr bm93blBvbHlQcm90b09mZnNldCwgcHJvdG90eXBlKTsKICAgICAgICAgICAgIHByb3RvdHlwZS0+ ZGlkQmVjb21lUHJvdG90eXBlKCk7CiAgICAgICAgICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFo YXNJbmRleGVkUHJvcGVydGllcyhyZXN1bHQtPmluZGV4aW5nVHlwZSgpKSwgIldlIHJlbHkgb24g SlNGaW5hbE9iamVjdCBub3Qgc3RhcnRpbmcgb3V0IHdpdGggYW4gaW5kZXhpbmcgdHlwZSBvdGhl cndpc2Ugd2Ugd291bGQgcG90ZW50aWFsbHkgbmVlZCB0byBjb252ZXJ0IHRvIHNsb3cgcHV0IHN0 b3JhZ2UiKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Z1bmN0aW9uUmFy ZURhdGEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9GdW5j dGlvblJhcmVEYXRhLmgJKHJldmlzaW9uIDIzMTE5MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL0Z1bmN0aW9uUmFyZURhdGEuaAkod29ya2luZyBjb3B5KQpAQCAtNzEsNiArNzEs NyBAQCBwdWJsaWM6CiAgICAgfQogCiAgICAgU3RydWN0dXJlKiBvYmplY3RBbGxvY2F0aW9uU3Ry dWN0dXJlKCkgeyByZXR1cm4gbV9vYmplY3RBbGxvY2F0aW9uUHJvZmlsZS5zdHJ1Y3R1cmUoKTsg fQorICAgIEpTT2JqZWN0KiBvYmplY3RBbGxvY2F0aW9uUHJvdG90eXBlKCkgeyByZXR1cm4gbV9v YmplY3RBbGxvY2F0aW9uUHJvZmlsZS5wcm90b3R5cGUoKTsgfQogCiAgICAgSW5saW5lV2F0Y2hw b2ludFNldCYgYWxsb2NhdGlvblByb2ZpbGVXYXRjaHBvaW50U2V0KCkKICAgICB7CkluZGV4OiBT b3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TdHJ1Y3R1cmUuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAJKHJldmlzaW9uIDIz MTE5MikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1N0cnVjdHVyZS5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTMwNiw3ICszMDYsNyBAQCBTdHJ1Y3R1cmUqIFN0cnVjdHVyZTo6Y3Jl YXRlKFBvbHlQcm90b1RhCiAKICAgICB1bnNpZ25lZCBvbGRPdXRPZkxpbmVDYXBhY2l0eSA9IHJl c3VsdC0+b3V0T2ZMaW5lQ2FwYWNpdHkoKTsKICAgICByZXN1bHQtPmFkZFByb3BlcnR5V2l0aG91 dFRyYW5zaXRpb24oCi0gICAgICAgIHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMo KS51bmRlcnNjb3JlUHJvdG9Qcml2YXRlTmFtZSgpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4oUHJv cGVydHlBdHRyaWJ1dGU6OkRvbnRFbnVtKSwKKyAgICAgICAgdm0sIHZtLnByb3BlcnR5TmFtZXMt PmJ1aWx0aW5OYW1lcygpLnBvbHlQcm90b05hbWUoKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KFBy b3BlcnR5QXR0cmlidXRlOjpEb250RW51bSksCiAgICAgICAgIFsmXSAoY29uc3QgR0NTYWZlQ29u Y3VycmVudEpTTG9ja2VyJiwgUHJvcGVydHlPZmZzZXQgb2Zmc2V0LCBQcm9wZXJ0eU9mZnNldCBu ZXdMYXN0T2Zmc2V0KSB7CiAgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVChTdHJ1Y3R1cmU6Om91 dE9mTGluZUNhcGFjaXR5KG5ld0xhc3RPZmZzZXQpID09IG9sZE91dE9mTGluZUNhcGFjaXR5KTsK ICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKG9mZnNldCA9PSBrbm93blBvbHlQcm90b09mZnNl dCk7Cg==