39444 2010-05-20 13:51:26 -0700 Whittling away at CodeBlock use: Removed a little wonkiness in closure lookup 2010-05-20 19:01:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ggaren webkit-unassigned oldest_to_newest 228535 0 ggaren 2010-05-20 13:51:26 -0700 Whittling away at CodeBlock use: Removed a little wonkiness in closure lookup 228540 1 56626 ggaren 2010-05-20 13:57:43 -0700 Created attachment 56626 Patch 228578 2 56626 oliver 2010-05-20 14:39:00 -0700 Comment on attachment 56626 Patch r=me 228692 3 ggaren 2010-05-20 19:01:43 -0700 Committed r59895: <http://trac.webkit.org/changeset/59895> 56626 2010-05-20 13:57:43 -0700 2010-05-20 14:38:59 -0700 Patch bug-39444-20100520135741.patch text/plain 9153 ggaren SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDU5ODYyKQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTAtMDUtMjAgIEdlb2ZmcmV5 IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXaGl0dGxpbmcgYXdheSBhdCBDb2RlQmxvY2sgdXNlOiBSZW1v dmVkIGEgbGl0dGxlIHdvbmtpbmVzcyBpbiBjbG9zdXJlIGxvb2t1cAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mzk0NDQKKyAgICAgICAgCisgICAgICAg IENhbGN1bGF0ZSBhbGwgbG9va3VwIGRlcHRocyBhdCBjb21waWxlIHRpbWUuIEknbSBub3Qgc3Vy ZSB3aHkgd2UgY291bGRuJ3QKKyAgICAgICAgZG8gdGhpcyBiZWZvcmUsIGJ1dCB3aGF0ZXZlciB0 aGUgcmVhc29uLCBpdCBzZWVtcyB0byBiZSBnb25lIG5vdy4KKworICAgICAgICAqIGJ5dGVjb21w aWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHA6CisgICAgICAgIChKU0M6OkJ5dGVjb2RlR2VuZXJh dG9yOjpmaW5kU2NvcGVkUHJvcGVydHkpOgorICAgICAgICAqIGJ5dGVjb21waWxlci9CeXRlY29k ZUdlbmVyYXRvci5oOgorICAgICAgICAqIGludGVycHJldGVyL0ludGVycHJldGVyLmNwcDoKKyAg ICAgICAgKEpTQzo6SW50ZXJwcmV0ZXI6OnJlc29sdmVTa2lwKToKKyAgICAgICAgKEpTQzo6SW50 ZXJwcmV0ZXI6OnJlc29sdmVHbG9iYWxEeW5hbWljKToKKyAgICAgICAgKEpTQzo6SW50ZXJwcmV0 ZXI6OnByaXZhdGVFeGVjdXRlKToKKyAgICAgICAgKiBqaXQvSklUT3Bjb2Rlcy5jcHA6CisgICAg ICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9nZXRfc2NvcGVkX3Zhcik6CisgICAgICAgIChKU0M6OkpJ VDo6ZW1pdF9vcF9wdXRfc2NvcGVkX3Zhcik6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9y ZXNvbHZlX3NraXApOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfcmVzb2x2ZV9nbG9iYWxf ZHluYW1pYyk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdFNsb3dfb3BfcmVzb2x2ZV9nbG9iYWxf ZHluYW1pYyk6CisgICAgICAgICogaml0L0pJVE9wY29kZXMzMl82NC5jcHA6CisgICAgICAgIChK U0M6OkpJVDo6ZW1pdF9vcF9nZXRfc2NvcGVkX3Zhcik6CisgICAgICAgIChKU0M6OkpJVDo6ZW1p dF9vcF9wdXRfc2NvcGVkX3Zhcik6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9yZXNvbHZl X3NraXApOgorCiAyMDEwLTA1LTE5ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJhcnJhY2xvdWdoQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KSW5kZXg6IEphdmFT Y3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRvci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gSmF2YVNjcmlwdENvcmUvYnl0ZWNvbXBpbGVyL0J5dGVjb2RlR2VuZXJhdG9yLmNwcAkocmV2 aXNpb24gNTk3NjkpCisrKyBKYXZhU2NyaXB0Q29yZS9ieXRlY29tcGlsZXIvQnl0ZWNvZGVHZW5l cmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDMxLDcgKzEwMzEsNyBAQCBib29sIEJ5dGVj b2RlR2VuZXJhdG9yOjpmaW5kU2NvcGVkUHJvcGVyCiAgICAgICAgICAgICAgICAgICAgIGdsb2Jh bE9iamVjdCA9IGN1cnJlbnRWYXJpYWJsZU9iamVjdDsKICAgICAgICAgICAgICAgICByZXR1cm4g ZmFsc2U7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBzdGFja0RlcHRoID0gZGVwdGg7Cisg ICAgICAgICAgICBzdGFja0RlcHRoID0gZGVwdGggKyBtX2NvZGVCbG9jay0+bmVlZHNGdWxsU2Nv cGVDaGFpbigpOwogICAgICAgICAgICAgaW5kZXggPSBlbnRyeS5nZXRJbmRleCgpOwogICAgICAg ICAgICAgaWYgKCsraXRlciA9PSBlbmQpCiAgICAgICAgICAgICAgICAgZ2xvYmFsT2JqZWN0ID0g Y3VycmVudFZhcmlhYmxlT2JqZWN0OwpAQCAtMTA0Myw3ICsxMDQzLDcgQEAgYm9vbCBCeXRlY29k ZUdlbmVyYXRvcjo6ZmluZFNjb3BlZFByb3BlcgogICAgICAgICByZXF1aXJlc0R5bmFtaWNDaGVj a3MgfD0gc2NvcGVSZXF1aXJlc0R5bmFtaWNDaGVja3M7CiAgICAgfQogICAgIC8vIENhbid0IGxv Y2F0ZSB0aGUgcHJvcGVydHkgYnV0IHdlJ3JlIGFibGUgdG8gYXZvaWQgYSBmZXcgbG9va3Vwcy4K LSAgICBzdGFja0RlcHRoID0gZGVwdGg7CisgICAgc3RhY2tEZXB0aCA9IGRlcHRoICsgbV9jb2Rl QmxvY2stPm5lZWRzRnVsbFNjb3BlQ2hhaW4oKTsKICAgICBpbmRleCA9IG1pc3NpbmdTeW1ib2xN YXJrZXIoKTsKICAgICBKU09iamVjdCogc2NvcGUgPSAqaXRlcjsKICAgICBpZiAoKytpdGVyID09 IGVuZCkKSW5kZXg6IEphdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdlbmVyYXRv ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL2J5dGVjb21waWxlci9CeXRlY29kZUdl bmVyYXRvci5oCShyZXZpc2lvbiA1OTc2OSkKKysrIEphdmFTY3JpcHRDb3JlL2J5dGVjb21waWxl ci9CeXRlY29kZUdlbmVyYXRvci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDMsOSArMTAzLDYgQEAg bmFtZXNwYWNlIEpTQyB7CiAgICAgICAgIC8vIFZhcmlhYmxlT2JqZWN0IHRoYXQgZGVmaW5lcyB0 aGUgcHJvcGVydHkuICBJZiB0aGUgcHJvcGVydHkgY2Fubm90IGJlIGZvdW5kCiAgICAgICAgIC8v IHN0YXRpY2FsbHksIGRlcHRoIHdpbGwgY29udGFpbiB0aGUgZGVwdGggb2YgdGhlIHNjb3BlIGNo YWluIHdoZXJlIGR5bmFtaWMKICAgICAgICAgLy8gbG9va3VwIG11c3QgYmVnaW4uCi0gICAgICAg IC8vCi0gICAgICAgIC8vIE5COiBkZXB0aCBkb2VzIF9ub3RfIGluY2x1ZGUgdGhlIGxvY2FsIHNj b3BlLiAgZWcuIGEgZGVwdGggb2YgMCByZWZlcnMKLSAgICAgICAgLy8gdG8gdGhlIHNjb3BlIGNv bnRhaW5pbmcgdGhpcyBjb2RlYmxvY2suCiAgICAgICAgIGJvb2wgZmluZFNjb3BlZFByb3BlcnR5 KGNvbnN0IElkZW50aWZpZXImLCBpbnQmIGluZGV4LCBzaXplX3QmIGRlcHRoLCBib29sIGZvcldy aXRpbmcsIGJvb2wmIGluY2x1ZGVzRHluYW1pY1Njb3BlcywgSlNPYmplY3QqJiBnbG9iYWxPYmpl Y3QpOwogCiAgICAgICAgIC8vIFJldHVybnMgdGhlIHJlZ2lzdGVyIHN0b3JpbmcgInRoaXMiCklu ZGV4OiBKYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9JbnRlcnByZXRlci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvSW50ZXJwcmV0ZXIuY3BwCShyZXZpc2lv biA1OTc5MSkKKysrIEphdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL0ludGVycHJldGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTE0LDcgKzExNCw3IEBAIE5FVkVSX0lOTElORSBib29sIEludGVy cHJldGVyOjpyZXNvbHZlU2sKIAogICAgIGludCBkc3QgPSB2UENbMV0udS5vcGVyYW5kOwogICAg IGludCBwcm9wZXJ0eSA9IHZQQ1syXS51Lm9wZXJhbmQ7Ci0gICAgaW50IHNraXAgPSB2UENbM10u dS5vcGVyYW5kICsgY29kZUJsb2NrLT5uZWVkc0Z1bGxTY29wZUNoYWluKCk7CisgICAgaW50IHNr aXAgPSB2UENbM10udS5vcGVyYW5kOwogCiAgICAgU2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2hhaW4g PSBjYWxsRnJhbWUtPnNjb3BlQ2hhaW4oKTsKICAgICBTY29wZUNoYWluSXRlcmF0b3IgaXRlciA9 IHNjb3BlQ2hhaW4tPmJlZ2luKCk7CkBAIC0xOTAsNyArMTkwLDcgQEAgTkVWRVJfSU5MSU5FIGJv b2wgSW50ZXJwcmV0ZXI6OnJlc29sdmVHbAogICAgIFN0cnVjdHVyZSogc3RydWN0dXJlID0gdlBD WzRdLnUuc3RydWN0dXJlOwogICAgIGludCBvZmZzZXQgPSB2UENbNV0udS5vcGVyYW5kOwogICAg IENvZGVCbG9jayogY29kZUJsb2NrID0gY2FsbEZyYW1lLT5jb2RlQmxvY2soKTsKLSAgICBpbnQg c2tpcCA9IHZQQ1s2XS51Lm9wZXJhbmQgKyBjb2RlQmxvY2stPm5lZWRzRnVsbFNjb3BlQ2hhaW4o KTsKKyAgICBpbnQgc2tpcCA9IHZQQ1s2XS51Lm9wZXJhbmQ7CiAgICAgCiAgICAgU2NvcGVDaGFp bk5vZGUqIHNjb3BlQ2hhaW4gPSBjYWxsRnJhbWUtPnNjb3BlQ2hhaW4oKTsKICAgICBTY29wZUNo YWluSXRlcmF0b3IgaXRlciA9IHNjb3BlQ2hhaW4tPmJlZ2luKCk7CkBAIC0yMTc2LDExICsyMTc2 LDExIEBAIEpTVmFsdWUgSW50ZXJwcmV0ZXI6OnByaXZhdGVFeGVjdXRlKEV4ZWMKICAgICAgICAg LyogZ2V0X3Njb3BlZF92YXIgZHN0KHIpIGluZGV4KG4pIHNraXAobikKIAogICAgICAgICAgTG9h ZHMgdGhlIGNvbnRlbnRzIG9mIHRoZSBpbmRleC10aCBsb2NhbCBmcm9tIHRoZSBzY29wZSBza2lw IG5vZGVzIGZyb20KLSAgICAgICAgIHRoZSB0b3Agb2YgdGhlIHNjb3BlIGNoYWluLCBhbmQgcGxh Y2VzIGl0IGluIHJlZ2lzdGVyIGRzdAorICAgICAgICAgdGhlIHRvcCBvZiB0aGUgc2NvcGUgY2hh aW4sIGFuZCBwbGFjZXMgaXQgaW4gcmVnaXN0ZXIgZHN0LgogICAgICAgICAgKi8KICAgICAgICAg aW50IGRzdCA9IHZQQ1sxXS51Lm9wZXJhbmQ7CiAgICAgICAgIGludCBpbmRleCA9IHZQQ1syXS51 Lm9wZXJhbmQ7Ci0gICAgICAgIGludCBza2lwID0gdlBDWzNdLnUub3BlcmFuZCArIGNhbGxGcmFt ZS0+Y29kZUJsb2NrKCktPm5lZWRzRnVsbFNjb3BlQ2hhaW4oKTsKKyAgICAgICAgaW50IHNraXAg PSB2UENbM10udS5vcGVyYW5kOwogCiAgICAgICAgIFNjb3BlQ2hhaW5Ob2RlKiBzY29wZUNoYWlu ID0gY2FsbEZyYW1lLT5zY29wZUNoYWluKCk7CiAgICAgICAgIFNjb3BlQ2hhaW5JdGVyYXRvciBp dGVyID0gc2NvcGVDaGFpbi0+YmVnaW4oKTsKQEAgLTIyMDEsNyArMjIwMSw3IEBAIEpTVmFsdWUg SW50ZXJwcmV0ZXI6OnByaXZhdGVFeGVjdXRlKEV4ZWMKIAogICAgICAgICAgKi8KICAgICAgICAg aW50IGluZGV4ID0gdlBDWzFdLnUub3BlcmFuZDsKLSAgICAgICAgaW50IHNraXAgPSB2UENbMl0u dS5vcGVyYW5kICsgY2FsbEZyYW1lLT5jb2RlQmxvY2soKS0+bmVlZHNGdWxsU2NvcGVDaGFpbigp OworICAgICAgICBpbnQgc2tpcCA9IHZQQ1syXS51Lm9wZXJhbmQ7CiAgICAgICAgIGludCB2YWx1 ZSA9IHZQQ1szXS51Lm9wZXJhbmQ7CiAKICAgICAgICAgU2NvcGVDaGFpbk5vZGUqIHNjb3BlQ2hh aW4gPSBjYWxsRnJhbWUtPnNjb3BlQ2hhaW4oKTsKSW5kZXg6IEphdmFTY3JpcHRDb3JlL2ppdC9K SVRPcGNvZGVzMzJfNjQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEphdmFTY3JpcHRDb3JlL2ppdC9KSVRP cGNvZGVzMzJfNjQuY3BwCShyZXZpc2lvbiA1OTc3NykKKysrIEphdmFTY3JpcHRDb3JlL2ppdC9K SVRPcGNvZGVzMzJfNjQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MTksNyArOTE5LDcgQEAgdm9p ZCBKSVQ6OmVtaXRfb3BfZ2V0X3Njb3BlZF92YXIoSW5zdHJ1YwogewogICAgIGludCBkc3QgPSBj dXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kOwogICAgIGludCBpbmRleCA9IGN1cnJlbnRJ bnN0cnVjdGlvblsyXS51Lm9wZXJhbmQ7Ci0gICAgaW50IHNraXAgPSBjdXJyZW50SW5zdHJ1Y3Rp b25bM10udS5vcGVyYW5kICsgbV9jb2RlQmxvY2stPm5lZWRzRnVsbFNjb3BlQ2hhaW4oKTsKKyAg ICBpbnQgc2tpcCA9IGN1cnJlbnRJbnN0cnVjdGlvblszXS51Lm9wZXJhbmQ7CiAKICAgICBlbWl0 R2V0RnJvbUNhbGxGcmFtZUhlYWRlclB0cihSZWdpc3RlckZpbGU6OlNjb3BlQ2hhaW4sIHJlZ1Qy KTsKICAgICB3aGlsZSAoc2tpcC0tKQpAQCAtOTM3LDcgKzkzNyw3IEBAIHZvaWQgSklUOjplbWl0 X29wX2dldF9zY29wZWRfdmFyKEluc3RydWMKIHZvaWQgSklUOjplbWl0X29wX3B1dF9zY29wZWRf dmFyKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiB7CiAgICAgaW50IGluZGV4ID0g Y3VycmVudEluc3RydWN0aW9uWzFdLnUub3BlcmFuZDsKLSAgICBpbnQgc2tpcCA9IGN1cnJlbnRJ bnN0cnVjdGlvblsyXS51Lm9wZXJhbmQgKyBtX2NvZGVCbG9jay0+bmVlZHNGdWxsU2NvcGVDaGFp bigpOworICAgIGludCBza2lwID0gY3VycmVudEluc3RydWN0aW9uWzJdLnUub3BlcmFuZDsKICAg ICBpbnQgdmFsdWUgPSBjdXJyZW50SW5zdHJ1Y3Rpb25bM10udS5vcGVyYW5kOwogCiAgICAgZW1p dExvYWQodmFsdWUsIHJlZ1QxLCByZWdUMCk7CkBAIC0xMDM0LDcgKzEwMzQsNyBAQCB2b2lkIEpJ VDo6ZW1pdF9vcF9yZXNvbHZlX3NraXAoSW5zdHJ1Y3RpCiB7CiAgICAgSklUU3R1YkNhbGwgc3R1 YkNhbGwodGhpcywgY3RpX29wX3Jlc29sdmVfc2tpcCk7CiAgICAgc3R1YkNhbGwuYWRkQXJndW1l bnQoSW1tUHRyKCZtX2NvZGVCbG9jay0+aWRlbnRpZmllcihjdXJyZW50SW5zdHJ1Y3Rpb25bMl0u dS5vcGVyYW5kKSkpOwotICAgIHN0dWJDYWxsLmFkZEFyZ3VtZW50KEltbTMyKGN1cnJlbnRJbnN0 cnVjdGlvblszXS51Lm9wZXJhbmQgKyBtX2NvZGVCbG9jay0+bmVlZHNGdWxsU2NvcGVDaGFpbigp KSk7CisgICAgc3R1YkNhbGwuYWRkQXJndW1lbnQoSW1tMzIoY3VycmVudEluc3RydWN0aW9uWzNd LnUub3BlcmFuZCkpOwogICAgIHN0dWJDYWxsLmNhbGwoY3VycmVudEluc3RydWN0aW9uWzFdLnUu b3BlcmFuZCk7CiB9CiAKSW5kZXg6IEphdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGNvZGVzLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2Rlcy5jcHAJKHJldmlzaW9u IDU5Nzc3KQorKysgSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wY29kZXMuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC03MjIsNyArNzIyLDcgQEAgdm9pZCBKSVQ6OmVtaXRfb3BfcHV0X2dsb2JhbF92YXIo SW5zdHJ1YwogCiB2b2lkIEpJVDo6ZW1pdF9vcF9nZXRfc2NvcGVkX3ZhcihJbnN0cnVjdGlvbiog Y3VycmVudEluc3RydWN0aW9uKQogewotICAgIGludCBza2lwID0gY3VycmVudEluc3RydWN0aW9u WzNdLnUub3BlcmFuZCArIG1fY29kZUJsb2NrLT5uZWVkc0Z1bGxTY29wZUNoYWluKCk7CisgICAg aW50IHNraXAgPSBjdXJyZW50SW5zdHJ1Y3Rpb25bM10udS5vcGVyYW5kOwogCiAgICAgZW1pdEdl dEZyb21DYWxsRnJhbWVIZWFkZXJQdHIoUmVnaXN0ZXJGaWxlOjpTY29wZUNoYWluLCByZWdUMCk7 CiAgICAgd2hpbGUgKHNraXAtLSkKQEAgLTczNSw3ICs3MzUsNyBAQCB2b2lkIEpJVDo6ZW1pdF9v cF9nZXRfc2NvcGVkX3ZhcihJbnN0cnVjCiAKIHZvaWQgSklUOjplbWl0X29wX3B1dF9zY29wZWRf dmFyKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiB7Ci0gICAgaW50IHNraXAgPSBj dXJyZW50SW5zdHJ1Y3Rpb25bMl0udS5vcGVyYW5kICsgbV9jb2RlQmxvY2stPm5lZWRzRnVsbFNj b3BlQ2hhaW4oKTsKKyAgICBpbnQgc2tpcCA9IGN1cnJlbnRJbnN0cnVjdGlvblsyXS51Lm9wZXJh bmQ7CiAKICAgICBlbWl0R2V0RnJvbUNhbGxGcmFtZUhlYWRlclB0cihSZWdpc3RlckZpbGU6OlNj b3BlQ2hhaW4sIHJlZ1QxKTsKICAgICBlbWl0R2V0VmlydHVhbFJlZ2lzdGVyKGN1cnJlbnRJbnN0 cnVjdGlvblszXS51Lm9wZXJhbmQsIHJlZ1QwKTsKQEAgLTg0OSw3ICs4NDksNyBAQCB2b2lkIEpJ VDo6ZW1pdF9vcF9yZXNvbHZlX3NraXAoSW5zdHJ1Y3RpCiB7CiAgICAgSklUU3R1YkNhbGwgc3R1 YkNhbGwodGhpcywgY3RpX29wX3Jlc29sdmVfc2tpcCk7CiAgICAgc3R1YkNhbGwuYWRkQXJndW1l bnQoSW1tUHRyKCZtX2NvZGVCbG9jay0+aWRlbnRpZmllcihjdXJyZW50SW5zdHJ1Y3Rpb25bMl0u dS5vcGVyYW5kKSkpOwotICAgIHN0dWJDYWxsLmFkZEFyZ3VtZW50KEltbTMyKGN1cnJlbnRJbnN0 cnVjdGlvblszXS51Lm9wZXJhbmQgKyBtX2NvZGVCbG9jay0+bmVlZHNGdWxsU2NvcGVDaGFpbigp KSk7CisgICAgc3R1YkNhbGwuYWRkQXJndW1lbnQoSW1tMzIoY3VycmVudEluc3RydWN0aW9uWzNd LnUub3BlcmFuZCkpOwogICAgIHN0dWJDYWxsLmNhbGwoY3VycmVudEluc3RydWN0aW9uWzFdLnUu b3BlcmFuZCk7CiB9CiAKQEAgLTE2OTcsNyArMTY5Nyw3IEBAIHZvaWQgSklUOjplbWl0U2xvd19v cF90b19qc251bWJlcihJbnN0cnUKIAogdm9pZCBKSVQ6OmVtaXRfb3BfcmVzb2x2ZV9nbG9iYWxf ZHluYW1pYyhJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogewotICAgIGludCBza2lw ID0gY3VycmVudEluc3RydWN0aW9uWzZdLnUub3BlcmFuZCArIG1fY29kZUJsb2NrLT5uZWVkc0Z1 bGxTY29wZUNoYWluKCk7CisgICAgaW50IHNraXAgPSBjdXJyZW50SW5zdHJ1Y3Rpb25bNl0udS5v cGVyYW5kOwogICAgIAogICAgIGVtaXRHZXRGcm9tQ2FsbEZyYW1lSGVhZGVyUHRyKFJlZ2lzdGVy RmlsZTo6U2NvcGVDaGFpbiwgcmVnVDApOwogICAgIHdoaWxlIChza2lwLS0pIHsKQEAgLTE3MTMs NyArMTcxMyw3IEBAIHZvaWQgSklUOjplbWl0U2xvd19vcF9yZXNvbHZlX2dsb2JhbF9keW4KICAg ICB1bnNpZ25lZCBkc3QgPSBjdXJyZW50SW5zdHJ1Y3Rpb25bMV0udS5vcGVyYW5kOwogICAgIHZv aWQqIGdsb2JhbE9iamVjdCA9IGN1cnJlbnRJbnN0cnVjdGlvblsyXS51LmpzQ2VsbDsKICAgICBJ ZGVudGlmaWVyKiBpZGVudCA9ICZtX2NvZGVCbG9jay0+aWRlbnRpZmllcihjdXJyZW50SW5zdHJ1 Y3Rpb25bM10udS5vcGVyYW5kKTsKLSAgICBpbnQgc2tpcCA9IGN1cnJlbnRJbnN0cnVjdGlvbls2 XS51Lm9wZXJhbmQgKyBtX2NvZGVCbG9jay0+bmVlZHNGdWxsU2NvcGVDaGFpbigpOworICAgIGlu dCBza2lwID0gY3VycmVudEluc3RydWN0aW9uWzZdLnUub3BlcmFuZDsKICAgICB3aGlsZSAoc2tp cC0tKQogICAgICAgICBsaW5rU2xvd0Nhc2UoaXRlcik7CiAgICAgSklUU3R1YkNhbGwgcmVzb2x2 ZVN0dWJDYWxsKHRoaXMsIGN0aV9vcF9yZXNvbHZlKTsK