41193 2010-06-24 23:06:35 -0700 Incorrect use of '+ 4' and 0 instead of tag and payload offsets in JSValue32_64 2010-06-24 23:18:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 oliver oliver oldest_to_newest 242848 0 oliver 2010-06-24 23:06:35 -0700 Incorrect use of '+ 4' and 0 instead of tag and payload offsets in JSValue32_64 242850 1 59736 oliver 2010-06-24 23:08:29 -0700 Created attachment 59736 Patch 242854 2 59736 mjs 2010-06-24 23:16:17 -0700 Comment on attachment 59736 Patch r=me 242857 3 oliver 2010-06-24 23:18:53 -0700 Committed r61830: <http://trac.webkit.org/changeset/61830> 59736 2010-06-24 23:08:29 -0700 2010-06-24 23:16:17 -0700 Patch bug-41193-20100624230828.patch text/plain 10109 oliver ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCA1NGJjNTdmNTc1ZWFkY2E0YmM0NDkyYzgzNjkzNmY5MjMxODAyZDhlLi5m NjlmMzU3NmFlODBiZWMyMDIwNTdmZTI2ZDgyNTE1YzU3NzRkNDY3IDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMjYgQEAKIDIwMTAtMDYtMjQgIE9saXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4K IAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbmNvcnJl Y3QgdXNlIG9mICcrIDQnIGFuZCAwIGluc3RlYWQgb2YgdGFnIGFuZCBwYXlsb2FkIG9mZnNldHMg aW4gSlNWYWx1ZTMyXzY0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00MTE5MworCisgICAgICAgIEkgbm90aWNlZCBhIHVzZSBvZiAnKyA0JyBpbiBzb21l IG9mIHRoZSAzMl82NCBjb2RlIHBhdGhzIGFuZCByZWFsaXNlZCB0aGVyZQorICAgICAgICB3ZXJl IGEgZmV3IHBsYWNlcyB3aGVyZSBlbmRpYW5uZXNzIHdhcyBiZWluZyBoYXJkY29kZWQuICBUaGlz IHBhdGNoIGZpeGVzCisgICAgICAgIHRoZSBlcnJvcnMgaSBjb3VsZCBmaW5kIHRocm91Z2ggY29k ZSBpbnNwZWN0aW9uLgorCisgICAgICAgICogaml0L0pJVE9wY29kZXMzMl82NC5jcHA6CisgICAg ICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9yZXNvbHZlX2dsb2JhbCk6CisgICAgICAgICogaml0L0pJ VFByb3BlcnR5QWNjZXNzMzJfNjQuY3BwOgorICAgICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfZ2V0 X2J5X3ZhbCk6CisgICAgICAgIChKU0M6OkpJVDo6ZW1pdF9vcF9wdXRfYnlfdmFsKToKKyAgICAg ICAgKEpTQzo6SklUOjpjb21waWxlR2V0RGlyZWN0T2Zmc2V0KToKKyAgICAgICAgKEpTQzo6SklU Ojpwcml2YXRlQ29tcGlsZVB1dEJ5SWRUcmFuc2l0aW9uKToKKyAgICAgICAgKEpTQzo6SklUOjpw YXRjaEdldEJ5SWRTZWxmKToKKyAgICAgICAgKEpTQzo6SklUOjpwYXRjaFB1dEJ5SWRSZXBsYWNl KToKKworMjAxMC0wNi0yNCAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgorCiAgICAg ICAgIEJ1aWxkIGZpeAogCiAgICAgICAgIFRlbXBvcmFyaWx5IGdldCB0aGUgdGlnZXIgYm90IHdv cmtpbmcgYWdhaW4gYnkgZGlzYWJsaW5nIHRoZQpkaWZmIC0tZ2l0IGEvSmF2YVNjcmlwdENvcmUv aml0L0pJVE9wY29kZXMzMl82NC5jcHAgYi9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3Bjb2RlczMy XzY0LmNwcAppbmRleCAzMDYyYTNkZDYyZmVmYmExNWYxNDg4YzQyM2Y0MDY3YmEwZTc4NWJkLi5h NDRhOGExY2Y5NDRmNzM4NGM0Yzk1Y2FhMmEwOTMxZDViYzFmMDU0IDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9qaXQvSklUT3Bjb2RlczMyXzY0LmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9q aXQvSklUT3Bjb2RlczMyXzY0LmNwcApAQCAtNjgxLDggKzY4MSw4IEBAIHZvaWQgSklUOjplbWl0 X29wX3Jlc29sdmVfZ2xvYmFsKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24sIGJvb2wg ZHluYW1pYykKICAgICAvLyBMb2FkIHByb3BlcnR5LgogICAgIGxvYWRQdHIoQWRkcmVzcyhyZWdU MCwgT0JKRUNUX09GRlNFVE9GKEpTR2xvYmFsT2JqZWN0LCBtX2V4dGVybmFsU3RvcmFnZSkpLCBy ZWdUMik7CiAgICAgbG9hZDMyKG9mZnNldEFkZHIsIHJlZ1QzKTsKLSAgICBsb2FkMzIoQmFzZUlu ZGV4KHJlZ1QyLCByZWdUMywgVGltZXNFaWdodCksIHJlZ1QwKTsgLy8gcGF5bG9hZAotICAgIGxv YWQzMihCYXNlSW5kZXgocmVnVDIsIHJlZ1QzLCBUaW1lc0VpZ2h0LCA0KSwgcmVnVDEpOyAvLyB0 YWcKKyAgICBsb2FkMzIoQmFzZUluZGV4KHJlZ1QyLCByZWdUMywgVGltZXNFaWdodCwgT0JKRUNU X09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnBheWxvYWQpKSwgcmVnVDApOyAvLyBwYXlsb2Fk CisgICAgbG9hZDMyKEJhc2VJbmRleChyZWdUMiwgcmVnVDMsIFRpbWVzRWlnaHQsIE9CSkVDVF9P RkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0cy50YWcpKSwgcmVnVDEpOyAvLyB0YWcKICAgICBlbWl0 U3RvcmUoZHN0LCByZWdUMSwgcmVnVDApOwogICAgIG1hcChtX2J5dGVjb2RlT2Zmc2V0ICsgZHlu YW1pYyA/IE9QQ09ERV9MRU5HVEgob3BfcmVzb2x2ZV9nbG9iYWxfZHluYW1pYykgOiBPUENPREVf TEVOR1RIKG9wX3Jlc29sdmVfZ2xvYmFsKSwgZHN0LCByZWdUMSwgcmVnVDApOwogfQpkaWZmIC0t Z2l0IGEvSmF2YVNjcmlwdENvcmUvaml0L0pJVFByb3BlcnR5QWNjZXNzMzJfNjQuY3BwIGIvSmF2 YVNjcmlwdENvcmUvaml0L0pJVFByb3BlcnR5QWNjZXNzMzJfNjQuY3BwCmluZGV4IGUwM2VlY2E3 ZjZkNjMxYzAzMDgyMTE1MWE3YzMwNTczYWU3ZTczYzEuLjE2Y2Y4NGFjNDYzZWZiYWMxNjkwYzli NzE4Mjk2OTEyMWI3ZDI4NjAgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRQcm9w ZXJ0eUFjY2VzczMyXzY0LmNwcAorKysgYi9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlB Y2Nlc3MzMl82NC5jcHAKQEAgLTMxNCw4ICszMTQsOCBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9nZXRf YnlfdmFsKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAgICAgbG9hZFB0cihBZGRy ZXNzKHJlZ1QwLCBPQkpFQ1RfT0ZGU0VUT0YoSlNBcnJheSwgbV9zdG9yYWdlKSksIHJlZ1QzKTsK ICAgICBhZGRTbG93Q2FzZShicmFuY2gzMihBYm92ZU9yRXF1YWwsIHJlZ1QyLCBBZGRyZXNzKHJl Z1QwLCBPQkpFQ1RfT0ZGU0VUT0YoSlNBcnJheSwgbV92ZWN0b3JMZW5ndGgpKSkpOwogICAgIAot ICAgIGxvYWQzMihCYXNlSW5kZXgocmVnVDMsIHJlZ1QyLCBUaW1lc0VpZ2h0LCBPQkpFQ1RfT0ZG U0VUT0YoQXJyYXlTdG9yYWdlLCBtX3ZlY3RvclswXSkgKyA0KSwgcmVnVDEpOyAvLyB0YWcKLSAg ICBsb2FkMzIoQmFzZUluZGV4KHJlZ1QzLCByZWdUMiwgVGltZXNFaWdodCwgT0JKRUNUX09GRlNF VE9GKEFycmF5U3RvcmFnZSwgbV92ZWN0b3JbMF0pKSwgcmVnVDApOyAvLyBwYXlsb2FkCisgICAg bG9hZDMyKEJhc2VJbmRleChyZWdUMywgcmVnVDIsIFRpbWVzRWlnaHQsIE9CSkVDVF9PRkZTRVRP RihBcnJheVN0b3JhZ2UsIG1fdmVjdG9yWzBdKSArIE9CSkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1 LmFzQml0cy50YWcpKSwgcmVnVDEpOyAvLyB0YWcKKyAgICBsb2FkMzIoQmFzZUluZGV4KHJlZ1Qz LCByZWdUMiwgVGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEFycmF5U3RvcmFnZSwgbV92ZWN0 b3JbMF0pICsgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnBheWxvYWQpKSwgcmVn VDApOyAvLyBwYXlsb2FkCiAgICAgYWRkU2xvd0Nhc2UoYnJhbmNoMzIoRXF1YWwsIHJlZ1QxLCBJ bW0zMihKU1ZhbHVlOjpFbXB0eVZhbHVlVGFnKSkpOwogICAgIAogICAgIGVtaXRTdG9yZShkc3Qs IHJlZ1QxLCByZWdUMCk7CkBAIC0zNjYsMTIgKzM2NiwxMiBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9w dXRfYnlfdmFsKEluc3RydWN0aW9uKiBjdXJyZW50SW5zdHJ1Y3Rpb24pCiAgICAgCiAgICAgbG9h ZFB0cihBZGRyZXNzKHJlZ1QwLCBPQkpFQ1RfT0ZGU0VUT0YoSlNBcnJheSwgbV9zdG9yYWdlKSks IHJlZ1QzKTsKICAgICAKLSAgICBKdW1wIGVtcHR5ID0gYnJhbmNoMzIoRXF1YWwsIEJhc2VJbmRl eChyZWdUMywgcmVnVDIsIFRpbWVzRWlnaHQsIE9CSkVDVF9PRkZTRVRPRihBcnJheVN0b3JhZ2Us IG1fdmVjdG9yWzBdKSArIDQpLCBJbW0zMihKU1ZhbHVlOjpFbXB0eVZhbHVlVGFnKSk7CisgICAg SnVtcCBlbXB0eSA9IGJyYW5jaDMyKEVxdWFsLCBCYXNlSW5kZXgocmVnVDMsIHJlZ1QyLCBUaW1l c0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0YoQXJyYXlTdG9yYWdlLCBtX3ZlY3RvclswXSkgKyBPQkpF Q1RfT0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMudGFnKSksIEltbTMyKEpTVmFsdWU6OkVtcHR5 VmFsdWVUYWcpKTsKICAgICAKICAgICBMYWJlbCBzdG9yZVJlc3VsdCh0aGlzKTsKICAgICBlbWl0 TG9hZCh2YWx1ZSwgcmVnVDEsIHJlZ1QwKTsKLSAgICBzdG9yZTMyKHJlZ1QwLCBCYXNlSW5kZXgo cmVnVDMsIHJlZ1QyLCBUaW1lc0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0YoQXJyYXlTdG9yYWdlLCBt X3ZlY3RvclswXSkpKTsgLy8gcGF5bG9hZAotICAgIHN0b3JlMzIocmVnVDEsIEJhc2VJbmRleChy ZWdUMywgcmVnVDIsIFRpbWVzRWlnaHQsIE9CSkVDVF9PRkZTRVRPRihBcnJheVN0b3JhZ2UsIG1f dmVjdG9yWzBdKSArIDQpKTsgLy8gdGFnCisgICAgc3RvcmUzMihyZWdUMCwgQmFzZUluZGV4KHJl Z1QzLCByZWdUMiwgVGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEFycmF5U3RvcmFnZSwgbV92 ZWN0b3JbMF0pICsgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnBheWxvYWQpKSk7 IC8vIHBheWxvYWQKKyAgICBzdG9yZTMyKHJlZ1QxLCBCYXNlSW5kZXgocmVnVDMsIHJlZ1QyLCBU aW1lc0VpZ2h0LCBPQkpFQ1RfT0ZGU0VUT0YoQXJyYXlTdG9yYWdlLCBtX3ZlY3RvclswXSkgKyBP QkpFQ1RfT0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMudGFnKSkpOyAvLyB0YWcKICAgICBKdW1w IGVuZCA9IGp1bXAoKTsKICAgICAKICAgICBlbXB0eS5saW5rKHRoaXMpOwpAQCAtNTcxLDggKzU3 MSw4IEBAIHZvaWQgSklUOjpjb21waWxlR2V0RGlyZWN0T2Zmc2V0KFJlZ2lzdGVySUQgYmFzZSwg UmVnaXN0ZXJJRCByZXN1bHRUYWcsIFJlZ2lzdGVyCiB2b2lkIEpJVDo6Y29tcGlsZUdldERpcmVj dE9mZnNldChKU09iamVjdCogYmFzZSwgUmVnaXN0ZXJJRCB0ZW1wLCBSZWdpc3RlcklEIHJlc3Vs dFRhZywgUmVnaXN0ZXJJRCByZXN1bHRQYXlsb2FkLCBzaXplX3QgY2FjaGVkT2Zmc2V0KQogewog ICAgIGlmIChiYXNlLT5pc1VzaW5nSW5saW5lU3RvcmFnZSgpKSB7Ci0gICAgICAgIGxvYWQzMihy ZWludGVycHJldF9jYXN0PGNoYXIqPigmYmFzZS0+bV9pbmxpbmVTdG9yYWdlW2NhY2hlZE9mZnNl dF0pLCByZXN1bHRQYXlsb2FkKTsKLSAgICAgICAgbG9hZDMyKHJlaW50ZXJwcmV0X2Nhc3Q8Y2hh cio+KCZiYXNlLT5tX2lubGluZVN0b3JhZ2VbY2FjaGVkT2Zmc2V0XSkgKyA0LCByZXN1bHRUYWcp OworICAgICAgICBsb2FkMzIocmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oJmJhc2UtPm1faW5saW5l U3RvcmFnZVtjYWNoZWRPZmZzZXRdKSArIE9CSkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0 cy5wYXlsb2FkKSwgcmVzdWx0UGF5bG9hZCk7CisgICAgICAgIGxvYWQzMihyZWludGVycHJldF9j YXN0PGNoYXIqPigmYmFzZS0+bV9pbmxpbmVTdG9yYWdlW2NhY2hlZE9mZnNldF0pICsgT0JKRUNU X09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnRhZyksIHJlc3VsdFRhZyk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CiAgICAgCkBAIC01ODAsOCArNTgwLDggQEAgdm9pZCBKSVQ6OmNvbXBpbGVH ZXREaXJlY3RPZmZzZXQoSlNPYmplY3QqIGJhc2UsIFJlZ2lzdGVySUQgdGVtcCwgUmVnaXN0ZXJJ RCByZXMKICAgICAKICAgICBQcm9wZXJ0eVN0b3JhZ2UqIHByb3RvUHJvcGVydHlTdG9yYWdlID0g JmJhc2UtPm1fZXh0ZXJuYWxTdG9yYWdlOwogICAgIGxvYWRQdHIoc3RhdGljX2Nhc3Q8dm9pZCo+ KHByb3RvUHJvcGVydHlTdG9yYWdlKSwgdGVtcCk7Ci0gICAgbG9hZDMyKEFkZHJlc3ModGVtcCwg b2Zmc2V0KSwgcmVzdWx0UGF5bG9hZCk7Ci0gICAgbG9hZDMyKEFkZHJlc3ModGVtcCwgb2Zmc2V0 ICsgNCksIHJlc3VsdFRhZyk7CisgICAgbG9hZDMyKEFkZHJlc3ModGVtcCwgb2Zmc2V0ICsgT0JK RUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnBheWxvYWQpKSwgcmVzdWx0UGF5bG9hZCk7 CisgICAgbG9hZDMyKEFkZHJlc3ModGVtcCwgb2Zmc2V0ICsgT0JKRUNUX09GRlNFVE9GKEpTVmFs dWUsIHUuYXNCaXRzLnRhZykpLCByZXN1bHRUYWcpOwogfQogCiB2b2lkIEpJVDo6dGVzdFByb3Rv dHlwZShTdHJ1Y3R1cmUqIHN0cnVjdHVyZSwgSnVtcExpc3QmIGZhaWx1cmVDYXNlcykKQEAgLTYy OCw4ICs2MjgsOCBAQCB2b2lkIEpJVDo6cHJpdmF0ZUNvbXBpbGVQdXRCeUlkVHJhbnNpdGlvbihT dHJ1Y3R1cmVTdHViSW5mbyogc3R1YkluZm8sIFN0cnVjdHVyZQogICAgIGFkZDMyKEltbTMyKDEp LCBBYnNvbHV0ZUFkZHJlc3MobmV3U3RydWN0dXJlLT5hZGRyZXNzT2ZDb3VudCgpKSk7CiAgICAg c3RvcmVQdHIoSW1tUHRyKG5ld1N0cnVjdHVyZSksIEFkZHJlc3MocmVnVDAsIE9CSkVDVF9PRkZT RVRPRihKU0NlbGwsIG1fc3RydWN0dXJlKSkpOwogICAgIAotICAgIGxvYWQzMihBZGRyZXNzKHN0 YWNrUG9pbnRlclJlZ2lzdGVyLCBPQkpFQ1RfT0ZGU0VUT0YoSklUU3RhY2tGcmFtZSwgYXJnc1sy XSkgKyBzaXplb2Yodm9pZCopKSwgcmVnVDMpOwotICAgIGxvYWQzMihBZGRyZXNzKHN0YWNrUG9p bnRlclJlZ2lzdGVyLCBPQkpFQ1RfT0ZGU0VUT0YoSklUU3RhY2tGcmFtZSwgYXJnc1syXSkgKyBz aXplb2Yodm9pZCopICsgNCksIHJlZ1QyKTsKKyAgICBsb2FkMzIoQWRkcmVzcyhzdGFja1BvaW50 ZXJSZWdpc3RlciwgT0JKRUNUX09GRlNFVE9GKEpJVFN0YWNrRnJhbWUsIGFyZ3NbMl0pICsgc2l6 ZW9mKHZvaWQqKSArIE9CSkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0cy5wYXlsb2FkKSks IHJlZ1QzKTsKKyAgICBsb2FkMzIoQWRkcmVzcyhzdGFja1BvaW50ZXJSZWdpc3RlciwgT0JKRUNU X09GRlNFVE9GKEpJVFN0YWNrRnJhbWUsIGFyZ3NbMl0pICsgc2l6ZW9mKHZvaWQqKSArIE9CSkVD VF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0cy50YWcpKSwgcmVnVDIpOwogICAgIAogICAgIC8v IFdyaXRlIHRoZSB2YWx1ZQogICAgIGNvbXBpbGVQdXREaXJlY3RPZmZzZXQocmVnVDAsIHJlZ1Qy LCByZWdUMywgbmV3U3RydWN0dXJlLCBjYWNoZWRPZmZzZXQpOwpAQCAtNjczLDggKzY3Myw4IEBA IHZvaWQgSklUOjpwYXRjaEdldEJ5SWRTZWxmKENvZGVCbG9jayogY29kZUJsb2NrLCBTdHJ1Y3R1 cmVTdHViSW5mbyogc3R1YkluZm8sIFN0CiAgICAgCiAgICAgLy8gUGF0Y2ggdGhlIG9mZnNldCBp bnRvIHRoZSBwcm9wb2VydHkgbWFwIHRvIGxvYWQgZnJvbSwgdGhlbiBwYXRjaCB0aGUgU3RydWN0 dXJlIHRvIGxvb2sgZm9yLgogICAgIHJlcGF0Y2hCdWZmZXIucmVwYXRjaChzdHViSW5mby0+aG90 UGF0aEJlZ2luLmRhdGFMYWJlbFB0ckF0T2Zmc2V0KHBhdGNoT2Zmc2V0R2V0QnlJZFN0cnVjdHVy ZSksIHN0cnVjdHVyZSk7Ci0gICAgcmVwYXRjaEJ1ZmZlci5yZXBhdGNoKHN0dWJJbmZvLT5ob3RQ YXRoQmVnaW4uZGF0YUxhYmVsMzJBdE9mZnNldChwYXRjaE9mZnNldEdldEJ5SWRQcm9wZXJ0eU1h cE9mZnNldDEpLCBvZmZzZXQpOyAvLyBwYXlsb2FkCi0gICAgcmVwYXRjaEJ1ZmZlci5yZXBhdGNo KHN0dWJJbmZvLT5ob3RQYXRoQmVnaW4uZGF0YUxhYmVsMzJBdE9mZnNldChwYXRjaE9mZnNldEdl dEJ5SWRQcm9wZXJ0eU1hcE9mZnNldDIpLCBvZmZzZXQgKyA0KTsgLy8gdGFnCisgICAgcmVwYXRj aEJ1ZmZlci5yZXBhdGNoKHN0dWJJbmZvLT5ob3RQYXRoQmVnaW4uZGF0YUxhYmVsMzJBdE9mZnNl dChwYXRjaE9mZnNldEdldEJ5SWRQcm9wZXJ0eU1hcE9mZnNldDEpLCBvZmZzZXQgKyBPQkpFQ1Rf T0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMucGF5bG9hZCkpOyAvLyBwYXlsb2FkCisgICAgcmVw YXRjaEJ1ZmZlci5yZXBhdGNoKHN0dWJJbmZvLT5ob3RQYXRoQmVnaW4uZGF0YUxhYmVsMzJBdE9m ZnNldChwYXRjaE9mZnNldEdldEJ5SWRQcm9wZXJ0eU1hcE9mZnNldDIpLCBvZmZzZXQgKyBPQkpF Q1RfT0ZGU0VUT0YoSlNWYWx1ZSwgdS5hc0JpdHMudGFnKSk7IC8vIHRhZwogfQogCiB2b2lkIEpJ VDo6cGF0Y2hNZXRob2RDYWxsUHJvdG8oQ29kZUJsb2NrKiBjb2RlQmxvY2ssIE1ldGhvZENhbGxM aW5rSW5mbyYgbWV0aG9kQ2FsbExpbmtJbmZvLCBKU0Z1bmN0aW9uKiBjYWxsZWUsIFN0cnVjdHVy ZSogc3RydWN0dXJlLCBKU09iamVjdCogcHJvdG8sIFJldHVybkFkZHJlc3NQdHIgcmV0dXJuQWRk cmVzcykKQEAgLTcxNCw4ICs3MTQsOCBAQCB2b2lkIEpJVDo6cGF0Y2hQdXRCeUlkUmVwbGFjZShD b2RlQmxvY2sqIGNvZGVCbG9jaywgU3RydWN0dXJlU3R1YkluZm8qIHN0dWJJbmZvLAogICAgIAog ICAgIC8vIFBhdGNoIHRoZSBvZmZzZXQgaW50byB0aGUgcHJvcG9lcnR5IG1hcCB0byBsb2FkIGZy b20sIHRoZW4gcGF0Y2ggdGhlIFN0cnVjdHVyZSB0byBsb29rIGZvci4KICAgICByZXBhdGNoQnVm ZmVyLnJlcGF0Y2goc3R1YkluZm8tPmhvdFBhdGhCZWdpbi5kYXRhTGFiZWxQdHJBdE9mZnNldChw YXRjaE9mZnNldFB1dEJ5SWRTdHJ1Y3R1cmUpLCBzdHJ1Y3R1cmUpOwotICAgIHJlcGF0Y2hCdWZm ZXIucmVwYXRjaChzdHViSW5mby0+aG90UGF0aEJlZ2luLmRhdGFMYWJlbDMyQXRPZmZzZXQocGF0 Y2hPZmZzZXRQdXRCeUlkUHJvcGVydHlNYXBPZmZzZXQxKSwgb2Zmc2V0KTsgLy8gcGF5bG9hZAot ICAgIHJlcGF0Y2hCdWZmZXIucmVwYXRjaChzdHViSW5mby0+aG90UGF0aEJlZ2luLmRhdGFMYWJl bDMyQXRPZmZzZXQocGF0Y2hPZmZzZXRQdXRCeUlkUHJvcGVydHlNYXBPZmZzZXQyKSwgb2Zmc2V0 ICsgNCk7IC8vIHRhZworICAgIHJlcGF0Y2hCdWZmZXIucmVwYXRjaChzdHViSW5mby0+aG90UGF0 aEJlZ2luLmRhdGFMYWJlbDMyQXRPZmZzZXQocGF0Y2hPZmZzZXRQdXRCeUlkUHJvcGVydHlNYXBP ZmZzZXQxKSwgb2Zmc2V0ICsgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnBheWxv YWQpKTsgLy8gcGF5bG9hZAorICAgIHJlcGF0Y2hCdWZmZXIucmVwYXRjaChzdHViSW5mby0+aG90 UGF0aEJlZ2luLmRhdGFMYWJlbDMyQXRPZmZzZXQocGF0Y2hPZmZzZXRQdXRCeUlkUHJvcGVydHlN YXBPZmZzZXQyKSwgb2Zmc2V0ICsgT0JKRUNUX09GRlNFVE9GKEpTVmFsdWUsIHUuYXNCaXRzLnRh ZykpOyAvLyB0YWcKIH0KIAogdm9pZCBKSVQ6OnByaXZhdGVDb21waWxlUGF0Y2hHZXRBcnJheUxl bmd0aChSZXR1cm5BZGRyZXNzUHRyIHJldHVybkFkZHJlc3MpCkBAIC0xMTIyLDggKzExMjIsOCBA QCB2b2lkIEpJVDo6Y29tcGlsZUdldERpcmVjdE9mZnNldChSZWdpc3RlcklEIGJhc2UsIFJlZ2lz dGVySUQgcmVzdWx0VGFnLCBSZWdpc3RlcgogICAgIEFTU0VSVChzaXplb2YoSlNWYWx1ZSkgPT0g OCk7CiAgICAgCiAgICAgSnVtcCBub3RVc2luZ0lubGluZVN0b3JhZ2UgPSBicmFuY2gzMihOb3RF cXVhbCwgQWRkcmVzcyhzdHJ1Y3R1cmUsIE9CSkVDVF9PRkZTRVRPRihTdHJ1Y3R1cmUsIG1fcHJv cGVydHlTdG9yYWdlQ2FwYWNpdHkpKSwgSW1tMzIoSlNPYmplY3Q6OmlubGluZVN0b3JhZ2VDYXBh Y2l0eSkpOwotICAgIGxvYWRQdHIoQmFzZUluZGV4KGJhc2UsIG9mZnNldCwgVGltZXNFaWdodCwg T0JKRUNUX09GRlNFVE9GKEpTT2JqZWN0LCBtX2lubGluZVN0b3JhZ2UpK09CSkVDVF9PRkZTRVRP RihKU1ZhbHVlLCB1LmFzQml0cy5wYXlsb2FkKSksIHJlc3VsdFBheWxvYWQpOwotICAgIGxvYWRQ dHIoQmFzZUluZGV4KGJhc2UsIG9mZnNldCwgVGltZXNFaWdodCwgT0JKRUNUX09GRlNFVE9GKEpT T2JqZWN0LCBtX2lubGluZVN0b3JhZ2UpK09CSkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0 cy50YWcpKSwgcmVzdWx0VGFnKTsKKyAgICBsb2FkUHRyKEJhc2VJbmRleChiYXNlLCBvZmZzZXQs IFRpbWVzRWlnaHQsIE9CSkVDVF9PRkZTRVRPRihKU09iamVjdCwgbV9pbmxpbmVTdG9yYWdlKSAr IE9CSkVDVF9PRkZTRVRPRihKU1ZhbHVlLCB1LmFzQml0cy5wYXlsb2FkKSksIHJlc3VsdFBheWxv YWQpOworICAgIGxvYWRQdHIoQmFzZUluZGV4KGJhc2UsIG9mZnNldCwgVGltZXNFaWdodCwgT0JK RUNUX09GRlNFVE9GKEpTT2JqZWN0LCBtX2lubGluZVN0b3JhZ2UpICsgT0JKRUNUX09GRlNFVE9G KEpTVmFsdWUsIHUuYXNCaXRzLnRhZykpLCByZXN1bHRUYWcpOwogICAgIEp1bXAgZmluaXNoZWRM b2FkID0ganVtcCgpOwogICAgIG5vdFVzaW5nSW5saW5lU3RvcmFnZS5saW5rKHRoaXMpOwogICAg IGxvYWRQdHIoQWRkcmVzcyhiYXNlLCBPQkpFQ1RfT0ZGU0VUT0YoSlNPYmplY3QsIG1fZXh0ZXJu YWxTdG9yYWdlKSksIGJhc2UpOwo=