198271 2019-05-27 04:45:20 -0700 JITOperations putByVal should mark negative array indices as out-of-bounds 2019-05-28 09:04:25 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tzagallo tzagallo commit-queue ews-watchlist fpizlo keith_miller mark.lam msaboff rmorisset saam webkit-bug-importer ysuzuki oldest_to_newest 1539374 0 tzagallo 2019-05-27 04:45:20 -0700 Like https://bugs.webkit.org/show_bug.cgi?id=198229, but for putByVal. 1539377 1 370689 tzagallo 2019-05-27 05:05:26 -0700 Created attachment 370689 Patch 1539420 2 370689 saam 2019-05-27 11:22:19 -0700 Comment on attachment 370689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=370689&action=review > Source/JavaScriptCore/jit/JITOperations.cpp:665 > +putProperty: Alternatively, you could have an “else if (subscript.isInt32() && baseValue.isObject()))” then mark as out of bounds 1539433 3 370689 tzagallo 2019-05-27 13:02:30 -0700 Comment on attachment 370689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=370689&action=review >> Source/JavaScriptCore/jit/JITOperations.cpp:665 >> +putProperty: > > Alternatively, you could have an “else if (subscript.isInt32() && baseValue.isObject()))” then mark as out of bounds What about `tookSlowPath`, do I also need to set it if it's int32 but not an object? I guess I don't get why don't we unconditionally set `tookSlowPath`. 1539489 4 370689 saam 2019-05-27 23:48:10 -0700 Comment on attachment 370689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=370689&action=review >>> Source/JavaScriptCore/jit/JITOperations.cpp:665 >>> +putProperty: >> >> Alternatively, you could have an “else if (subscript.isInt32() && baseValue.isObject()))” then mark as out of bounds > > What about `tookSlowPath`, do I also need to set it if it's int32 but not an object? I guess I don't get why don't we unconditionally set `tookSlowPath`. I'm also not sure. It probably has to do with normal indexed lookups, but you should look at the code in the DFG (I'm assuming) that reads it 1539490 5 saam 2019-05-27 23:48:25 -0700 Maybe it affects how we speculate. 1539583 6 370745 tzagallo 2019-05-28 08:47:49 -0700 Created attachment 370745 Patch for landing 1539595 7 370745 commit-queue 2019-05-28 09:03:08 -0700 Comment on attachment 370745 Patch for landing Clearing flags on attachment: 370745 Committed r245813: <https://trac.webkit.org/changeset/245813> 1539596 8 commit-queue 2019-05-28 09:03:10 -0700 All reviewed patches have been landed. Closing bug. 1539597 9 webkit-bug-importer 2019-05-28 09:04:25 -0700 <rdar://problem/51180527> 370689 2019-05-27 05:05:26 -0700 2019-05-28 08:47:44 -0700 Patch bug-198271-20190527140525.patch text/plain 5463 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1Nzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk ZjVhZGM0Y2M3MjVmYTQ2MWIyYWM4OTc0Zjc3MjU1OGYxMWE1NDU1Li42M2FjOTQ1ZGRjYzM2ZDI2 N2UwNTBlYzIwYjEyOGI4YzA4OWE4MTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOS0wNS0yNyAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBKSVRPcGVyYXRpb25zIHB1dEJ5VmFsIHNob3VsZCBtYXJrIG5lZ2F0aXZl IGFycmF5IGluZGljZXMgYXMgb3V0LW9mLWJvdW5kcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgU2ltaWxhciB0byB3aGF0IHdhcyBkb25lIHRvIGdldEJ5 VmFsIGluIHIyNDU3NjksIHdlIHNob3VsZCBhbHNvIG1hcmsgcHV0X2J5X3ZhbCBhcyBvdXQtb2Yt Ym91bmRzCisgICAgICAgIHdoZW4gd2UgZXhpdCBmcm9tIERGRyBmb3IgcHV0dGluZyB0byBhIG5l Z2F0aXZlIGluZGV4LiBUaGlzIGF2b2lkcyB0aGUgc2FtZSBzY2VuYXJpbyB3aGVyZSB3ZSBrZWVw CisgICAgICAgIHJlY29tcGlsaW5nIGEgQ29kZUJsb2NrIHdpdGggREZHIGFuZCBleGl0aW5nIGF0 IHRoZSBzYW1lIGJ5dGVjb2RlLgorCisgICAgICAgIFRoaXMgaXMgYSAzLjd4IGltcHJvdmVtZW50 IGluIHRoZSBtaWNyb2JlbmNobWFyayBiZWluZyBhZGRlZDogcHV0LWJ5LXZhbC1uZWdhdGl2ZS1h cnJheS1pbmRleC5qcy4KKworICAgICAgICAqIGppdC9KSVRPcGVyYXRpb25zLmNwcDoKKwogMjAx OS0wNS0yNSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KIAogICAgICAgICBK SVRPcGVyYXRpb25zIGdldEJ5VmFsIHNob3VsZCBtYXJrIG5lZ2F0aXZlIGFycmF5IGluZGljZXMg YXMgb3V0LW9mLWJvdW5kcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVRPcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9u cy5jcHAKaW5kZXggYjVjNTQ1YjhjMGNiZjk1YjI1ZTFjNWI2NzZlNjIxNGE1NzQ0MTBhNy4uYWM5 NzAyMmIxZjNiM2YyZmE2MDhiNGYwMzU3MjllZmJhYWE4YzFkNSAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCkBAIC02MzEsMTIgKzYzMSwxMiBAQCBzdGF0 aWMgdm9pZCBwdXRCeVZhbChDYWxsRnJhbWUqIGNhbGxGcmFtZSwgSlNWYWx1ZSBiYXNlVmFsdWUs IEpTVmFsdWUgc3Vic2NyaXB0LAogewogICAgIFZNJiB2bSA9IGNhbGxGcmFtZS0+dm0oKTsKICAg ICBhdXRvIHNjb3BlID0gREVDTEFSRV9USFJPV19TQ09QRSh2bSk7Ci0gICAgaWYgKExJS0VMWShz dWJzY3JpcHQuaXNVSW50MzIoKSkpIHsKKyAgICBpZiAoTElLRUxZKHN1YnNjcmlwdC5pc0ludDMy KCkpKSB7CiAgICAgICAgIGJ5VmFsSW5mby0+dG9va1Nsb3dQYXRoID0gdHJ1ZTsKLSAgICAgICAg dWludDMyX3QgaSA9IHN1YnNjcmlwdC5hc1VJbnQzMigpOworICAgICAgICBpbnQzMl90IGkgPSBz dWJzY3JpcHQuYXNJbnQzMigpOwogICAgICAgICBpZiAoYmFzZVZhbHVlLmlzT2JqZWN0KCkpIHsK ICAgICAgICAgICAgIEpTT2JqZWN0KiBvYmplY3QgPSBhc09iamVjdChiYXNlVmFsdWUpOwotICAg ICAgICAgICAgaWYgKG9iamVjdC0+Y2FuU2V0SW5kZXhRdWlja2x5KGkpKSB7CisgICAgICAgICAg ICBpZiAoaSA+PSAwICYmIG9iamVjdC0+Y2FuU2V0SW5kZXhRdWlja2x5KGkpKSB7CiAgICAgICAg ICAgICAgICAgb2JqZWN0LT5zZXRJbmRleFF1aWNrbHkodm0sIGksIHZhbHVlKTsKICAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CkBAIC02NDUsMTYgKzY0NSwyNCBAQCBzdGF0 aWMgdm9pZCBwdXRCeVZhbChDYWxsRnJhbWUqIGNhbGxGcmFtZSwgSlNWYWx1ZSBiYXNlVmFsdWUs IEpTVmFsdWUgc3Vic2NyaXB0LAogICAgICAgICAgICAgLy8gb3V0LW9mLWJvdW5kcy4KICAgICAg ICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDk4ODYK ICAgICAgICAgICAgIGJ5VmFsSW5mby0+YXJyYXlQcm9maWxlLT5zZXRPdXRPZkJvdW5kcygpOwor CisgICAgICAgICAgICBpZiAoaSA8IDApCisgICAgICAgICAgICAgICAgZ290byBwdXRQcm9wZXJ0 eTsKKwogICAgICAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICAgICAgb2JqZWN0LT5t ZXRob2RUYWJsZSh2bSktPnB1dEJ5SW5kZXgob2JqZWN0LCBjYWxsRnJhbWUsIGksIHZhbHVlLCBj YWxsRnJhbWUtPmNvZGVCbG9jaygpLT5pc1N0cmljdE1vZGUoKSk7CiAgICAgICAgICAgICByZXR1 cm47CiAgICAgICAgIH0KIAorICAgICAgICBpZiAoaSA8IDApCisgICAgICAgICAgICBnb3RvIHB1 dFByb3BlcnR5OworCiAgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgYmFzZVZhbHVl LnB1dEJ5SW5kZXgoY2FsbEZyYW1lLCBpLCB2YWx1ZSwgY2FsbEZyYW1lLT5jb2RlQmxvY2soKS0+ aXNTdHJpY3RNb2RlKCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCitwdXRQcm9wZXJ0eToK ICAgICBhdXRvIHByb3BlcnR5ID0gc3Vic2NyaXB0LnRvUHJvcGVydHlLZXkoY2FsbEZyYW1lKTsK ICAgICAvLyBEb24ndCBwdXQgdG8gYW4gb2JqZWN0IGlmIHRvU3RyaW5nIHRocmV3IGFuIGV4Y2Vw dGlvbi4KICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCB2b2lkKCkpOwpkaWZmIC0tZ2l0 IGEvSlNUZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCA5NmQwODNjOTNh ODVkZmM4MWM1ODk1MjZjM2E0MzlkYmQ4YmQ4ODFhLi40MGE3ZDMyOWRmNmFmMWQzNGVlNzg2NmRl MWMyZWNmYjQ4Yzg3YzQzIDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA1LTI3ICBUYWRldSBaYWdhbGxv ICA8dHphZ2FsbG9AYXBwbGUuY29tPgorCisgICAgICAgIEpJVE9wZXJhdGlvbnMgcHV0QnlWYWwg c2hvdWxkIG1hcmsgbmVnYXRpdmUgYXJyYXkgaW5kaWNlcyBhcyBvdXQtb2YtYm91bmRzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTgyNzEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIG1pY3JvYmVuY2ht YXJrcy9nZXQtYnktdmFsLW5lZ2F0aXZlLWFycmF5LWluZGV4LmpzOgorICAgICAgICAoZm9vKToK KyAgICAgICAgVXBkYXRlIHRoZSBnZXRCeVZhbCBtaWNyb2JlbmNobWFyayBhZGRlZCBpbiByMjQ1 NzY5LiBUaGlzIG5vdyBzaG93cyB0aGF0IHIyNDU3NjkKKyAgICAgICAgaXMgNC4yeCBmYXN0ZXIg dGhhbiB0aGUgcHJldmlvdXMgY29tbWl0LgorCisgICAgICAgICogbWljcm9iZW5jaG1hcmtzL3B1 dC1ieS12YWwtbmVnYXRpdmUtYXJyYXktaW5kZXguanM6IEFkZGVkLgorICAgICAgICAoZm9vKToK KwogMjAxOS0wNS0yNSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KIAogICAg ICAgICBKSVRPcGVyYXRpb25zIGdldEJ5VmFsIHNob3VsZCBtYXJrIG5lZ2F0aXZlIGFycmF5IGlu ZGljZXMgYXMgb3V0LW9mLWJvdW5kcwpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9taWNyb2JlbmNobWFy a3MvZ2V0LWJ5LXZhbC1uZWdhdGl2ZS1hcnJheS1pbmRleC5qcyBiL0pTVGVzdHMvbWljcm9iZW5j aG1hcmtzL2dldC1ieS12YWwtbmVnYXRpdmUtYXJyYXktaW5kZXguanMKaW5kZXggMWE4NjkxNWY1 OWM0N2U4NzkzYTNkZGFjODdhMWFlNmVhMTE4MTlmZS4uMWQ2N2MyYzI1NzNiOGViZjRmYTRjOTVl MGU5NmY4YTk0YjkxNmY4ZiAxMDA2NDQKLS0tIGEvSlNUZXN0cy9taWNyb2JlbmNobWFya3MvZ2V0 LWJ5LXZhbC1uZWdhdGl2ZS1hcnJheS1pbmRleC5qcworKysgYi9KU1Rlc3RzL21pY3JvYmVuY2ht YXJrcy9nZXQtYnktdmFsLW5lZ2F0aXZlLWFycmF5LWluZGV4LmpzCkBAIC0xLDExICsxLDE5IEBA CiBmdW5jdGlvbiBmb28oYXJyLCBpbmRleCkgeworICAgIGZvciAobGV0IGkgPSAwOyBpIDwgMWUy OyBpKyspIHsKKyAgICAgICAgbGV0IHggPSB7fTsKKyAgICAgICAgeC54ID0gYXJyOworICAgIH0K KwogICAgIHJldHVybiBhcnJbaW5kZXhdOwogfQogbm9JbmxpbmUoZm9vKTsKIAotY29uc3QgYXJy ID0gbmV3IEFycmF5KDEwMDApLmZpbGwoe30pOwotZm9yIChsZXQgaSA9IDA7IGkgPCAxZTc7IGkr KykgeworY29uc3QgYXJyID0gbmV3IEFycmF5KDEwKS5maWxsKHt9KTsKK2ZvciAobGV0IGkgPSAw OyBpIDwgMWU2OyBpKyspIHsKKyAgICBmb28oYXJyLCBpICUgYXJyLmxlbmd0aCk7Cit9Citmb3Ig KGxldCBpID0gMDsgaSA8IDFlNjsgaSsrKSB7CiAgICAgZm9vKGFyciwgaSAlIGFyci5sZW5ndGgp OwotICAgIGlmICghKGkgJSAxZTMpKQorICAgIGlmICghKGkgJSBhcnIubGVuZ3RoKSkKICAgICAg ICAgZm9vKGFyciwgLTEpOwogfQpkaWZmIC0tZ2l0IGEvSlNUZXN0cy9taWNyb2JlbmNobWFya3Mv cHV0LWJ5LXZhbC1uZWdhdGl2ZS1hcnJheS1pbmRleC5qcyBiL0pTVGVzdHMvbWljcm9iZW5jaG1h cmtzL3B1dC1ieS12YWwtbmVnYXRpdmUtYXJyYXktaW5kZXguanMKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNWY4NzQ2 ZTU2ZjllNzBhMThjOTU1N2QzZGE0YTM4MTBkMzY3ZmQxZgotLS0gL2Rldi9udWxsCisrKyBiL0pT VGVzdHMvbWljcm9iZW5jaG1hcmtzL3B1dC1ieS12YWwtbmVnYXRpdmUtYXJyYXktaW5kZXguanMK QEAgLTAsMCArMSwyMCBAQAorZnVuY3Rpb24gZm9vKGFyciwgaW5kZXgpIHsKKyAgICBhcnJbaW5k ZXhdID0gaW5kZXg7CisKKyAgICBmb3IgKGxldCBqID0gMDsgaiA8IDFlMjsgaisrKSB7CisgICAg ICAgIGxldCB4ID0ge307CisgICAgICAgIHgueCA9IGFycjsKKyAgICB9Cit9Citub0lubGluZShm b28pOworCitjb25zdCBhcnIgPSBuZXcgQXJyYXkoMTApLmZpbGwoe30pOworbGV0IHJlc3VsdCA9 IDA7Citmb3IgKGxldCBpID0gMDsgaSA8IDFlNjsgaSsrKSB7CisgICAgcmVzdWx0ICs9IGZvbyhh cnIsIGkgJSBhcnIubGVuZ3RoKTsKK30KK2ZvciAobGV0IGkgPSAwOyBpIDwgMWU2OyBpKyspIHsK KyAgICByZXN1bHQgKz0gZm9vKGFyciwgaSAlIGFyci5sZW5ndGgpOworICAgIGlmICghKGkgJSBh cnIubGVuZ3RoKSkKKyAgICAgICAgcmVzdWx0ICs9IGZvbyhhcnIsIC0xKTsKK30K 370745 2019-05-28 08:47:49 -0700 2019-05-28 09:03:08 -0700 Patch for landing bug-198271-20190528174747.patch text/plain 4376 tzagallo U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1Nzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBk ZjVhZGM0Y2M3MjVmYTQ2MWIyYWM4OTc0Zjc3MjU1OGYxMWE1NDU1Li4wZGFjMzQ4YjA1MTE4ZTAw NmQxZDliYmVlZGQyMjg1NDJmMzQyY2VlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxOS0wNS0yNyAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNv bT4KKworICAgICAgICBKSVRPcGVyYXRpb25zIHB1dEJ5VmFsIHNob3VsZCBtYXJrIG5lZ2F0aXZl IGFycmF5IGluZGljZXMgYXMgb3V0LW9mLWJvdW5kcworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4MjcxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2Fh bSBCYXJhdGkuCisKKyAgICAgICAgU2ltaWxhciB0byB3aGF0IHdhcyBkb25lIHRvIGdldEJ5VmFs IGluIHIyNDU3NjksIHdlIHNob3VsZCBhbHNvIG1hcmsgcHV0X2J5X3ZhbCBhcyBvdXQtb2YtYm91 bmRzCisgICAgICAgIHdoZW4gd2UgZXhpdCBmcm9tIERGRyBmb3IgcHV0dGluZyB0byBhIG5lZ2F0 aXZlIGluZGV4LiBUaGlzIGF2b2lkcyB0aGUgc2FtZSBzY2VuYXJpbyB3aGVyZSB3ZSBrZWVwCisg ICAgICAgIHJlY29tcGlsaW5nIGEgQ29kZUJsb2NrIHdpdGggREZHIGFuZCBleGl0aW5nIGF0IHRo ZSBzYW1lIGJ5dGVjb2RlLgorCisgICAgICAgIFRoaXMgaXMgYSAzLjd4IGltcHJvdmVtZW50IGlu IHRoZSBtaWNyb2JlbmNobWFyayBiZWluZyBhZGRlZDogcHV0LWJ5LXZhbC1uZWdhdGl2ZS1hcnJh eS1pbmRleC5qcy4KKworICAgICAgICAqIGppdC9KSVRPcGVyYXRpb25zLmNwcDoKKwogMjAxOS0w NS0yNSAgVGFkZXUgWmFnYWxsbyAgPHR6YWdhbGxvQGFwcGxlLmNvbT4KIAogICAgICAgICBKSVRP cGVyYXRpb25zIGdldEJ5VmFsIHNob3VsZCBtYXJrIG5lZ2F0aXZlIGFycmF5IGluZGljZXMgYXMg b3V0LW9mLWJvdW5kcwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRP cGVyYXRpb25zLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5j cHAKaW5kZXggYjVjNTQ1YjhjMGNiZjk1YjI1ZTFjNWI2NzZlNjIxNGE1NzQ0MTBhNy4uZmJkNmQ3 MzY5Yjk1MmNkOTc3Y2M1MjIzYTFkYjhhYjk4MzZmOTZhYyAxMDA2NDQKLS0tIGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCkBAIC02NTMsNiArNjUzLDEwIEBAIHN0YXRpYyB2 b2lkIHB1dEJ5VmFsKENhbGxGcmFtZSogY2FsbEZyYW1lLCBKU1ZhbHVlIGJhc2VWYWx1ZSwgSlNW YWx1ZSBzdWJzY3JpcHQsCiAgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgYmFzZVZh bHVlLnB1dEJ5SW5kZXgoY2FsbEZyYW1lLCBpLCB2YWx1ZSwgY2FsbEZyYW1lLT5jb2RlQmxvY2so KS0+aXNTdHJpY3RNb2RlKCkpOwogICAgICAgICByZXR1cm47CisgICAgfSBlbHNlIGlmIChzdWJz Y3JpcHQuaXNJbnQzMigpKSB7CisgICAgICAgIGJ5VmFsSW5mby0+dG9va1Nsb3dQYXRoID0gdHJ1 ZTsKKyAgICAgICAgaWYgKGJhc2VWYWx1ZS5pc09iamVjdCgpKQorICAgICAgICAgICAgYnlWYWxJ bmZvLT5hcnJheVByb2ZpbGUtPnNldE91dE9mQm91bmRzKCk7CiAgICAgfQogCiAgICAgYXV0byBw cm9wZXJ0eSA9IHN1YnNjcmlwdC50b1Byb3BlcnR5S2V5KGNhbGxGcmFtZSk7CmRpZmYgLS1naXQg YS9KU1Rlc3RzL0NoYW5nZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IDk2ZDA4M2M5M2E4 NWRmYzgxYzU4OTUyNmMzYTQzOWRiZDhiZDg4MWEuLmM1N2ZkNmJhNDExZDVhMDlmMWY1MThhNTMw N2RkMWRiMmVlZGIyMTAgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVz dHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDUtMjcgIFRhZGV1IFphZ2FsbG8g IDx0emFnYWxsb0BhcHBsZS5jb20+CisKKyAgICAgICAgSklUT3BlcmF0aW9ucyBwdXRCeVZhbCBz aG91bGQgbWFyayBuZWdhdGl2ZSBhcnJheSBpbmRpY2VzIGFzIG91dC1vZi1ib3VuZHMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5ODI3MQorCisgICAg ICAgIFJldmlld2VkIGJ5IFNhYW0gQmFyYXRpLgorCisgICAgICAgICogbWljcm9iZW5jaG1hcmtz L2dldC1ieS12YWwtbmVnYXRpdmUtYXJyYXktaW5kZXguanM6CisgICAgICAgIChmb28pOgorICAg ICAgICBVcGRhdGUgdGhlIGdldEJ5VmFsIG1pY3JvYmVuY2htYXJrIGFkZGVkIGluIHIyNDU3Njku IFRoaXMgbm93IHNob3dzIHRoYXQgcjI0NTc2OQorICAgICAgICBpcyA0LjJ4IGZhc3RlciB0aGFu IHRoZSBwcmV2aW91cyBjb21taXQuCisKKyAgICAgICAgKiBtaWNyb2JlbmNobWFya3MvcHV0LWJ5 LXZhbC1uZWdhdGl2ZS1hcnJheS1pbmRleC5qczogQWRkZWQuCisgICAgICAgIChmb28pOgorCiAy MDE5LTA1LTI1ICBUYWRldSBaYWdhbGxvICA8dHphZ2FsbG9AYXBwbGUuY29tPgogCiAgICAgICAg IEpJVE9wZXJhdGlvbnMgZ2V0QnlWYWwgc2hvdWxkIG1hcmsgbmVnYXRpdmUgYXJyYXkgaW5kaWNl cyBhcyBvdXQtb2YtYm91bmRzCmRpZmYgLS1naXQgYS9KU1Rlc3RzL21pY3JvYmVuY2htYXJrcy9n ZXQtYnktdmFsLW5lZ2F0aXZlLWFycmF5LWluZGV4LmpzIGIvSlNUZXN0cy9taWNyb2JlbmNobWFy a3MvZ2V0LWJ5LXZhbC1uZWdhdGl2ZS1hcnJheS1pbmRleC5qcwppbmRleCAxYTg2OTE1ZjU5YzQ3 ZTg3OTNhM2RkYWM4N2ExYWU2ZWExMTgxOWZlLi4xZDY3YzJjMjU3M2I4ZWJmNGZhNGM5NWUwZTk2 ZjhhOTRiOTE2ZjhmIDEwMDY0NAotLS0gYS9KU1Rlc3RzL21pY3JvYmVuY2htYXJrcy9nZXQtYnkt dmFsLW5lZ2F0aXZlLWFycmF5LWluZGV4LmpzCisrKyBiL0pTVGVzdHMvbWljcm9iZW5jaG1hcmtz L2dldC1ieS12YWwtbmVnYXRpdmUtYXJyYXktaW5kZXguanMKQEAgLTEsMTEgKzEsMTkgQEAKIGZ1 bmN0aW9uIGZvbyhhcnIsIGluZGV4KSB7CisgICAgZm9yIChsZXQgaSA9IDA7IGkgPCAxZTI7IGkr KykgeworICAgICAgICBsZXQgeCA9IHt9OworICAgICAgICB4LnggPSBhcnI7CisgICAgfQorCiAg ICAgcmV0dXJuIGFycltpbmRleF07CiB9CiBub0lubGluZShmb28pOwogCi1jb25zdCBhcnIgPSBu ZXcgQXJyYXkoMTAwMCkuZmlsbCh7fSk7Ci1mb3IgKGxldCBpID0gMDsgaSA8IDFlNzsgaSsrKSB7 Citjb25zdCBhcnIgPSBuZXcgQXJyYXkoMTApLmZpbGwoe30pOworZm9yIChsZXQgaSA9IDA7IGkg PCAxZTY7IGkrKykgeworICAgIGZvbyhhcnIsIGkgJSBhcnIubGVuZ3RoKTsKK30KK2ZvciAobGV0 IGkgPSAwOyBpIDwgMWU2OyBpKyspIHsKICAgICBmb28oYXJyLCBpICUgYXJyLmxlbmd0aCk7Ci0g ICAgaWYgKCEoaSAlIDFlMykpCisgICAgaWYgKCEoaSAlIGFyci5sZW5ndGgpKQogICAgICAgICBm b28oYXJyLCAtMSk7CiB9CmRpZmYgLS1naXQgYS9KU1Rlc3RzL21pY3JvYmVuY2htYXJrcy9wdXQt YnktdmFsLW5lZ2F0aXZlLWFycmF5LWluZGV4LmpzIGIvSlNUZXN0cy9taWNyb2JlbmNobWFya3Mv cHV0LWJ5LXZhbC1uZWdhdGl2ZS1hcnJheS1pbmRleC5qcwpuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi41Zjg3NDZlNTZm OWU3MGExOGM5NTU3ZDNkYTRhMzgxMGQzNjdmZDFmCi0tLSAvZGV2L251bGwKKysrIGIvSlNUZXN0 cy9taWNyb2JlbmNobWFya3MvcHV0LWJ5LXZhbC1uZWdhdGl2ZS1hcnJheS1pbmRleC5qcwpAQCAt MCwwICsxLDIwIEBACitmdW5jdGlvbiBmb28oYXJyLCBpbmRleCkgeworICAgIGFycltpbmRleF0g PSBpbmRleDsKKworICAgIGZvciAobGV0IGogPSAwOyBqIDwgMWUyOyBqKyspIHsKKyAgICAgICAg bGV0IHggPSB7fTsKKyAgICAgICAgeC54ID0gYXJyOworICAgIH0KK30KK25vSW5saW5lKGZvbyk7 CisKK2NvbnN0IGFyciA9IG5ldyBBcnJheSgxMCkuZmlsbCh7fSk7CitsZXQgcmVzdWx0ID0gMDsK K2ZvciAobGV0IGkgPSAwOyBpIDwgMWU2OyBpKyspIHsKKyAgICByZXN1bHQgKz0gZm9vKGFyciwg aSAlIGFyci5sZW5ndGgpOworfQorZm9yIChsZXQgaSA9IDA7IGkgPCAxZTY7IGkrKykgeworICAg IHJlc3VsdCArPSBmb28oYXJyLCBpICUgYXJyLmxlbmd0aCk7CisgICAgaWYgKCEoaSAlIGFyci5s ZW5ndGgpKQorICAgICAgICByZXN1bHQgKz0gZm9vKGFyciwgLTEpOworfQo=