182441 2018-02-02 10:58:38 -0800 More ARM64_32 fixes. 2018-02-02 12:25:21 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 mark.lam mark.lam benjamin cdumez cmarcelo dbates ews-watchlist keith_miller mitz msaboff saam webkit-bug-importer oldest_to_newest 1395907 0 mark.lam 2018-02-02 10:58:38 -0800 My previous speculative ARM64_32 build fix in copyLCharsFromUCharSource() was wrong. I've now fixed it to use choose the default case instead of the ARM64 case if the target is ARM64_32. I also disabled more dynamicPoisoning code in ARM64_32. This code assumes a 64-bit pointer which is not applicable here. 1395909 1 webkit-bug-importer 2018-02-02 11:00:43 -0800 <rdar://problem/37162310> 1395910 2 332982 mark.lam 2018-02-02 11:06:36 -0800 Created attachment 332982 proposed patch. 1395916 3 332985 mark.lam 2018-02-02 11:16:54 -0800 Created attachment 332985 patch for landing. 1395950 4 mark.lam 2018-02-02 12:25:21 -0800 Thanks for the review. Landed in r228022: <http://trac.webkit.org/r228022>. 332982 2018-02-02 11:06:36 -0800 2018-02-02 11:16:54 -0800 proposed patch. bug-182441.patch text/plain 4367 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjI4MDE3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE4LTAyLTAyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN b3JlIEFSTTY0XzMyIGZpeGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTgyNDQxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzE2MjMxMD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJIGFsc28gZGlz YWJsZWQgbW9yZSBkeW5hbWljUG9pc29uaW5nIGNvZGUgaW4gQVJNNjRfMzIuICBUaGlzIGNvZGUg YXNzdW1lcyBhCisgICAgICAgIDY0LWJpdCBwb2ludGVyIHdoaWNoIGlzIG5vdCBhcHBsaWNhYmxl IGhlcmUuCisKKyAgICAgICAgKiBqaXQvQXNzZW1ibHlIZWxwZXJzLmNwcDoKKyAgICAgICAgKEpT Qzo6QXNzZW1ibHlIZWxwZXJzOjplbWl0RHluYW1pY1BvaXNvbik6CisgICAgICAgIChKU0M6OkFz c2VtYmx5SGVscGVyczo6ZW1pdER5bmFtaWNQb2lzb25PbkxvYWRlZFR5cGUpOgorICAgICAgICAo SlNDOjpBc3NlbWJseUhlbHBlcnM6OmVtaXREeW5hbWljUG9pc29uT25UeXBlKToKKwogMjAxOC0w Mi0wMiAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBb SlNDXSBDbGVhbiB1cCBBcnJheVNwZWNpZXNDcmVhdGUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5jcHAJKHJldmlzaW9uIDIyNzk5NykKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMTAwOSw3ICsxMDA5LDcgQEAgdm9pZCBBc3NlbWJseUhlbHBlcnM6OmVtaXRQcmVwYXJl UHJlY2lzZQogCiB2b2lkIEFzc2VtYmx5SGVscGVyczo6ZW1pdER5bmFtaWNQb2lzb24oR1BSUmVn IGJhc2UsIEdQUlJlZyBwb2lzb25WYWx1ZSkKIHsKLSNpZiBDUFUoWDg2XzY0KSB8fCBDUFUoQVJN NjQpCisjaWYgQ1BVKFg4Nl82NCkgfHwgKENQVShBUk02NCkgJiYgIWRlZmluZWQoX19JTFAzMl9f KSkKICAgICBsc2hpZnRQdHIoVHJ1c3RlZEltbTMyKDQwKSwgcG9pc29uVmFsdWUpOwogICAgIGFk ZFB0cihwb2lzb25WYWx1ZSwgYmFzZSk7CiAjZWxzZQpAQCAtMTAyMCw3ICsxMDIwLDcgQEAgdm9p ZCBBc3NlbWJseUhlbHBlcnM6OmVtaXREeW5hbWljUG9pc29uKAogCiB2b2lkIEFzc2VtYmx5SGVs cGVyczo6ZW1pdER5bmFtaWNQb2lzb25PbkxvYWRlZFR5cGUoR1BSUmVnIGJhc2UsIEdQUlJlZyBh Y3R1YWxUeXBlLCBKU1R5cGUgZXhwZWN0ZWRUeXBlKQogewotI2lmIENQVShYODZfNjQpIHx8IENQ VShBUk02NCkKKyNpZiBDUFUoWDg2XzY0KSB8fCAoQ1BVKEFSTTY0KSAmJiAhZGVmaW5lZChfX0lM UDMyX18pKQogICAgIHhvcjMyKFRydXN0ZWRJbW0zMihleHBlY3RlZFR5cGUpLCBhY3R1YWxUeXBl KTsKICAgICBlbWl0RHluYW1pY1BvaXNvbihiYXNlLCBhY3R1YWxUeXBlKTsKICNlbHNlCkBAIC0x MDMyLDcgKzEwMzIsNyBAQCB2b2lkIEFzc2VtYmx5SGVscGVyczo6ZW1pdER5bmFtaWNQb2lzb25P CiAKIHZvaWQgQXNzZW1ibHlIZWxwZXJzOjplbWl0RHluYW1pY1BvaXNvbk9uVHlwZShHUFJSZWcg YmFzZSwgR1BSUmVnIHNjcmF0Y2gsIEpTVHlwZSBleHBlY3RlZFR5cGUpCiB7Ci0jaWYgQ1BVKFg4 Nl82NCkgfHwgQ1BVKEFSTTY0KQorI2lmIENQVShYODZfNjQpIHx8IChDUFUoQVJNNjQpICYmICFk ZWZpbmVkKF9fSUxQMzJfXykpCiAgICAgbG9hZDgoQWRkcmVzcyhiYXNlLCBKU0NlbGw6OnR5cGVJ bmZvVHlwZU9mZnNldCgpKSwgc2NyYXRjaCk7CiAgICAgZW1pdER5bmFtaWNQb2lzb25PbkxvYWRl ZFR5cGUoYmFzZSwgc2NyYXRjaCwgZXhwZWN0ZWRUeXBlKTsKICNlbHNlCkluZGV4OiBTb3VyY2Uv V1RGL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL0NoYW5nZUxvZwkocmV2aXNp b24gMjI3OTk3KQorKysgU291cmNlL1dURi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEs MyArMSwxOCBAQAorMjAxOC0wMi0wMiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CisK KyAgICAgICAgTW9yZSBBUk02NF8zMiBmaXhlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQ0MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzcx NjIzMTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg TXkgcHJldmlvdXMgc3BlY3VsYXRpdmUgQVJNNjRfMzIgYnVpbGQgZml4IGluIGNvcHlMQ2hhcnNG cm9tVUNoYXJTb3VyY2UoKSB3YXMgd3JvbmcuCisgICAgICAgIEkndmUgbm93IGZpeGVkIGl0IHRv IGNob29zZSB0aGUgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBjYXNlIGluc3RlYWQgb2YgdGhlIEFS TTY0CisgICAgICAgIGNhc2UgaWYgdGhlIHRhcmdldCBpcyBBUk02NF8zMi4KKworICAgICAgICAq IHd0Zi90ZXh0L0FTQ0lJRmFzdFBhdGguaDoKKyAgICAgICAgKFdURjo6Y29weUxDaGFyc0Zyb21V Q2hhclNvdXJjZSk6CisKIDIwMTgtMDItMDEgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFy b0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXUEVdW0dUS10gTWFrZSBSdW5Mb29wOjpUaW1lckJh c2Ugcm9idXN0IHRvIGl0cyBvd24gZGVsZXRpb24gaW5zaWRlIGl0cyBzb3VyY2UgY2FsbGJhY2sK SW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RleHQvQVNDSUlGYXN0UGF0aC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XVEYvd3RmL3RleHQvQVNDSUlGYXN0UGF0aC5oCShyZXZpc2lvbiAyMjc5OTcpCisr KyBTb3VyY2UvV1RGL3d0Zi90ZXh0L0FTQ0lJRmFzdFBhdGguaAkod29ya2luZyBjb3B5KQpAQCAt MTM5LDcgKzEzOSw3IEBAIGlubGluZSB2b2lkIGNvcHlMQ2hhcnNGcm9tVUNoYXJTb3VyY2UoTEMK ICAgICAgICAgQVNTRVJUKCEoc291cmNlW2ldICYgMHhmZjAwKSk7CiAgICAgICAgIGRlc3RpbmF0 aW9uW2ldID0gc3RhdGljX2Nhc3Q8TENoYXI+KHNvdXJjZVtpXSk7CiAgICAgfQotI2VsaWYgQ09N UElMRVIoR0NDX09SX0NMQU5HKSAmJiBDUFUoQVJNNjQpICYmIGRlZmluZWQoTkRFQlVHKQorI2Vs aWYgQ09NUElMRVIoR0NDX09SX0NMQU5HKSAmJiBDUFUoQVJNNjQpICYmICFkZWZpbmVkKF9fSUxQ MzJfXykgJiYgZGVmaW5lZChOREVCVUcpCiAgICAgY29uc3QgTENoYXIqIGNvbnN0IGVuZCA9IGRl c3RpbmF0aW9uICsgbGVuZ3RoOwogICAgIGNvbnN0IHVpbnRwdHJfdCBtZW1vcnlBY2Nlc3NTaXpl ID0gMTY7CiAKQEAgLTE1MCwxMyArMTUwLDggQEAgaW5saW5lIHZvaWQgY29weUxDaGFyc0Zyb21V Q2hhclNvdXJjZShMQwogICAgICAgICBjb25zdCB1aW50cHRyX3QgbGVuZ3RoTGVmdCA9IGVuZCAt IGRlc3RpbmF0aW9uOwogICAgICAgICBjb25zdCBMQ2hhciogY29uc3Qgc2ltZEVuZCA9IGRlc3Rp bmF0aW9uICsgKGxlbmd0aExlZnQgJiB+bWVtb3J5QWNjZXNzTWFzayk7CiAgICAgICAgIGRvIHsK LSNpZiBkZWZpbmVkKF9fSUxQMzJfXykKLSAgICAgICAgICAgIGFzbSgibGQyICAgeyB2MC4xNkIs IHYxLjE2QiB9LCBbJXdbU09VUkNFXV0sICMzMlxuXHQiCi0gICAgICAgICAgICAgICAgInN0MSAg IHsgdjAuMTZCIH0sIFsld1tERVNUSU5BVElPTl1dLCAjMTZcblx0IgotI2Vsc2UKICAgICAgICAg ICAgIGFzbSgibGQyICAgeyB2MC4xNkIsIHYxLjE2QiB9LCBbJVtTT1VSQ0VdXSwgIzMyXG5cdCIK ICAgICAgICAgICAgICAgICAic3QxICAgeyB2MC4xNkIgfSwgWyVbREVTVElOQVRJT05dXSwgIzE2 XG5cdCIKLSNlbmRpZgogICAgICAgICAgICAgICAgIDogW1NPVVJDRV0iK3IiIChzb3VyY2UpLCBb REVTVElOQVRJT05dIityIiAoZGVzdGluYXRpb24pCiAgICAgICAgICAgICAgICAgOgogICAgICAg ICAgICAgICAgIDogIm1lbW9yeSIsICJ2MCIsICJ2MSIpOwo= 332985 2018-02-02 11:16:54 -0800 2018-02-02 11:16:54 -0800 patch for landing. bug-182441.patch text/plain 4391 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjI4MDE4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBA CisyMDE4LTAyLTAyICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBN b3JlIEFSTTY0XzMyIGZpeGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTgyNDQxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzE2MjMxMD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgorCisgICAgICAgIEkgYWxzbyBkaXNh YmxlZCBtb3JlIGR5bmFtaWNQb2lzb25pbmcgY29kZSBpbiBBUk02NF8zMi4gIFRoaXMgY29kZSBh c3N1bWVzIGEKKyAgICAgICAgNjQtYml0IHBvaW50ZXIgd2hpY2ggaXMgbm90IGFwcGxpY2FibGUg aGVyZS4KKworICAgICAgICAqIGppdC9Bc3NlbWJseUhlbHBlcnMuY3BwOgorICAgICAgICAoSlND OjpBc3NlbWJseUhlbHBlcnM6OmVtaXREeW5hbWljUG9pc29uKToKKyAgICAgICAgKEpTQzo6QXNz ZW1ibHlIZWxwZXJzOjplbWl0RHluYW1pY1BvaXNvbk9uTG9hZGVkVHlwZSk6CisgICAgICAgIChK U0M6OkFzc2VtYmx5SGVscGVyczo6ZW1pdER5bmFtaWNQb2lzb25PblR5cGUpOgorCiAyMDE4LTAy LTAyICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIE1hcEhhc2gg c2hvdWxkIHJldHVybiB0cnVlIHRvIGRvZXNHQyBpbiB0aGUgREZHIGRlcGVuZGluZyBvbiB1c2VL aW5kIGJlY2F1c2UgaXQgbWlnaHQgcmVzb2x2ZSBhIHJvcGUKSW5kZXg6IFNvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L0Fzc2VtYmx5SGVscGVycy5jcHAJKHJldmlzaW9uIDIyODAxOCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvQXNzZW1ibHlIZWxwZXJzLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTAwOSw3ICsxMDA5LDcgQEAgdm9pZCBBc3NlbWJseUhlbHBlcnM6OmVtaXRQcmVw YXJlUHJlY2lzZQogCiB2b2lkIEFzc2VtYmx5SGVscGVyczo6ZW1pdER5bmFtaWNQb2lzb24oR1BS UmVnIGJhc2UsIEdQUlJlZyBwb2lzb25WYWx1ZSkKIHsKLSNpZiBDUFUoWDg2XzY0KSB8fCBDUFUo QVJNNjQpCisjaWYgQ1BVKFg4Nl82NCkgfHwgKENQVShBUk02NCkgJiYgIWRlZmluZWQoX19JTFAz Ml9fKSkKICAgICBsc2hpZnRQdHIoVHJ1c3RlZEltbTMyKDQwKSwgcG9pc29uVmFsdWUpOwogICAg IGFkZFB0cihwb2lzb25WYWx1ZSwgYmFzZSk7CiAjZWxzZQpAQCAtMTAyMCw3ICsxMDIwLDcgQEAg dm9pZCBBc3NlbWJseUhlbHBlcnM6OmVtaXREeW5hbWljUG9pc29uKAogCiB2b2lkIEFzc2VtYmx5 SGVscGVyczo6ZW1pdER5bmFtaWNQb2lzb25PbkxvYWRlZFR5cGUoR1BSUmVnIGJhc2UsIEdQUlJl ZyBhY3R1YWxUeXBlLCBKU1R5cGUgZXhwZWN0ZWRUeXBlKQogewotI2lmIENQVShYODZfNjQpIHx8 IENQVShBUk02NCkKKyNpZiBDUFUoWDg2XzY0KSB8fCAoQ1BVKEFSTTY0KSAmJiAhZGVmaW5lZChf X0lMUDMyX18pKQogICAgIHhvcjMyKFRydXN0ZWRJbW0zMihleHBlY3RlZFR5cGUpLCBhY3R1YWxU eXBlKTsKICAgICBlbWl0RHluYW1pY1BvaXNvbihiYXNlLCBhY3R1YWxUeXBlKTsKICNlbHNlCkBA IC0xMDMyLDcgKzEwMzIsNyBAQCB2b2lkIEFzc2VtYmx5SGVscGVyczo6ZW1pdER5bmFtaWNQb2lz b25PCiAKIHZvaWQgQXNzZW1ibHlIZWxwZXJzOjplbWl0RHluYW1pY1BvaXNvbk9uVHlwZShHUFJS ZWcgYmFzZSwgR1BSUmVnIHNjcmF0Y2gsIEpTVHlwZSBleHBlY3RlZFR5cGUpCiB7Ci0jaWYgQ1BV KFg4Nl82NCkgfHwgQ1BVKEFSTTY0KQorI2lmIENQVShYODZfNjQpIHx8IChDUFUoQVJNNjQpICYm ICFkZWZpbmVkKF9fSUxQMzJfXykpCiAgICAgbG9hZDgoQWRkcmVzcyhiYXNlLCBKU0NlbGw6OnR5 cGVJbmZvVHlwZU9mZnNldCgpKSwgc2NyYXRjaCk7CiAgICAgZW1pdER5bmFtaWNQb2lzb25Pbkxv YWRlZFR5cGUoYmFzZSwgc2NyYXRjaCwgZXhwZWN0ZWRUeXBlKTsKICNlbHNlCkluZGV4OiBTb3Vy Y2UvV1RGL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL0NoYW5nZUxvZwkocmV2 aXNpb24gMjI4MDE4KQorKysgU291cmNlL1dURi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAg LTEsMyArMSwxOCBAQAorMjAxOC0wMi0wMiAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+ CisKKyAgICAgICAgTW9yZSBBUk02NF8zMiBmaXhlcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjQ0MQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MzcxNjIzMTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KKworICAgICAg ICBNeSBwcmV2aW91cyBzcGVjdWxhdGl2ZSBBUk02NF8zMiBidWlsZCBmaXggaW4gY29weUxDaGFy c0Zyb21VQ2hhclNvdXJjZSgpIHdhcyB3cm9uZy4KKyAgICAgICAgSSd2ZSBub3cgZml4ZWQgaXQg dG8gY2hvb3NlIHRoZSBkZWZhdWx0IGltcGxlbWVudGF0aW9uIGNhc2UgaW5zdGVhZCBvZiB0aGUg QVJNNjQKKyAgICAgICAgY2FzZSBpZiB0aGUgdGFyZ2V0IGlzIEFSTTY0XzMyLgorCisgICAgICAg ICogd3RmL3RleHQvQVNDSUlGYXN0UGF0aC5oOgorICAgICAgICAoV1RGOjpjb3B5TENoYXJzRnJv bVVDaGFyU291cmNlKToKKwogMjAxOC0wMi0wMiAgS29uc3RhbnRpbiBUb2thcmV2ICA8YW5udWxl bkB5YW5kZXgucnU+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXggZm9yIEpTQ09ubHkg b24gbWFjT1MgYWZ0ZXIgcjIyNzg0NS4KSW5kZXg6IFNvdXJjZS9XVEYvd3RmL3RleHQvQVNDSUlG YXN0UGF0aC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3RleHQvQVNDSUlGYXN0UGF0 aC5oCShyZXZpc2lvbiAyMjgwMTgpCisrKyBTb3VyY2UvV1RGL3d0Zi90ZXh0L0FTQ0lJRmFzdFBh dGguaAkod29ya2luZyBjb3B5KQpAQCAtMTM5LDcgKzEzOSw3IEBAIGlubGluZSB2b2lkIGNvcHlM Q2hhcnNGcm9tVUNoYXJTb3VyY2UoTEMKICAgICAgICAgQVNTRVJUKCEoc291cmNlW2ldICYgMHhm ZjAwKSk7CiAgICAgICAgIGRlc3RpbmF0aW9uW2ldID0gc3RhdGljX2Nhc3Q8TENoYXI+KHNvdXJj ZVtpXSk7CiAgICAgfQotI2VsaWYgQ09NUElMRVIoR0NDX09SX0NMQU5HKSAmJiBDUFUoQVJNNjQp ICYmIGRlZmluZWQoTkRFQlVHKQorI2VsaWYgQ09NUElMRVIoR0NDX09SX0NMQU5HKSAmJiBDUFUo QVJNNjQpICYmICFkZWZpbmVkKF9fSUxQMzJfXykgJiYgZGVmaW5lZChOREVCVUcpCiAgICAgY29u c3QgTENoYXIqIGNvbnN0IGVuZCA9IGRlc3RpbmF0aW9uICsgbGVuZ3RoOwogICAgIGNvbnN0IHVp bnRwdHJfdCBtZW1vcnlBY2Nlc3NTaXplID0gMTY7CiAKQEAgLTE1MCwxMyArMTUwLDggQEAgaW5s aW5lIHZvaWQgY29weUxDaGFyc0Zyb21VQ2hhclNvdXJjZShMQwogICAgICAgICBjb25zdCB1aW50 cHRyX3QgbGVuZ3RoTGVmdCA9IGVuZCAtIGRlc3RpbmF0aW9uOwogICAgICAgICBjb25zdCBMQ2hh ciogY29uc3Qgc2ltZEVuZCA9IGRlc3RpbmF0aW9uICsgKGxlbmd0aExlZnQgJiB+bWVtb3J5QWNj ZXNzTWFzayk7CiAgICAgICAgIGRvIHsKLSNpZiBkZWZpbmVkKF9fSUxQMzJfXykKLSAgICAgICAg ICAgIGFzbSgibGQyICAgeyB2MC4xNkIsIHYxLjE2QiB9LCBbJXdbU09VUkNFXV0sICMzMlxuXHQi Ci0gICAgICAgICAgICAgICAgInN0MSAgIHsgdjAuMTZCIH0sIFsld1tERVNUSU5BVElPTl1dLCAj MTZcblx0IgotI2Vsc2UKICAgICAgICAgICAgIGFzbSgibGQyICAgeyB2MC4xNkIsIHYxLjE2QiB9 LCBbJVtTT1VSQ0VdXSwgIzMyXG5cdCIKICAgICAgICAgICAgICAgICAic3QxICAgeyB2MC4xNkIg fSwgWyVbREVTVElOQVRJT05dXSwgIzE2XG5cdCIKLSNlbmRpZgogICAgICAgICAgICAgICAgIDog W1NPVVJDRV0iK3IiIChzb3VyY2UpLCBbREVTVElOQVRJT05dIityIiAoZGVzdGluYXRpb24pCiAg ICAgICAgICAgICAgICAgOgogICAgICAgICAgICAgICAgIDogIm1lbW9yeSIsICJ2MCIsICJ2MSIp Owo=