165014 2016-11-21 18:33:49 -0800 Fix exception scope verification failures in runtime/Intl* files. 2016-11-28 15:56:58 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162351 1 mark.lam mark.lam fpizlo ggaren jfbastien keith_miller msaboff saam ysuzuki oldest_to_newest 1253314 0 mark.lam 2016-11-21 18:33:49 -0800 Patch coming. 1253315 1 295317 mark.lam 2016-11-21 18:38:00 -0800 Created attachment 295317 proposed patch. 1254077 2 mark.lam 2016-11-28 15:56:58 -0800 Thanks for the review. Landed in r209043: <http://trac.webkit.org/r209043>. 295317 2016-11-21 18:38:00 -0800 2016-11-28 14:23:52 -0800 proposed patch. bug-165014.patch text/plain 11607 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4OTU2KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDE2LTExLTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggZXhjZXB0aW9uIHNjb3BlIHZlcmlmaWNhdGlvbiBmYWlsdXJlcyBpbiBydW50aW1lL0ludGwq IGZpbGVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTY1MDE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBydW50aW1lL0ludGxDb2xsYXRvckNvbnN0cnVjdG9yLmNwcDoKKyAgICAgICAgKEpTQzo6Y29u c3RydWN0SW50bENvbGxhdG9yKToKKyAgICAgICAgKEpTQzo6SW50bENvbGxhdG9yQ29uc3RydWN0 b3JGdW5jU3VwcG9ydGVkTG9jYWxlc09mKToKKyAgICAgICAgKiBydW50aW1lL0ludGxDb2xsYXRv clByb3RvdHlwZS5jcHA6CisgICAgICAgIChKU0M6OkludGxDb2xsYXRvclByb3RvdHlwZUZ1bmNS ZXNvbHZlZE9wdGlvbnMpOgorICAgICAgICAqIHJ1bnRpbWUvSW50bERhdGVUaW1lRm9ybWF0Q29u c3RydWN0b3IuY3BwOgorICAgICAgICAoSlNDOjpjb25zdHJ1Y3RJbnRsRGF0ZVRpbWVGb3JtYXQp OgorICAgICAgICAoSlNDOjpJbnRsRGF0ZVRpbWVGb3JtYXRDb25zdHJ1Y3RvckZ1bmNTdXBwb3J0 ZWRMb2NhbGVzT2YpOgorICAgICAgICAqIHJ1bnRpbWUvSW50bERhdGVUaW1lRm9ybWF0UHJvdG90 eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6SW50bERhdGVUaW1lRm9ybWF0RnVuY0Zvcm1hdERhdGVU aW1lKToKKyAgICAgICAgKEpTQzo6SW50bERhdGVUaW1lRm9ybWF0UHJvdG90eXBlR2V0dGVyRm9y bWF0KToKKyAgICAgICAgKEpTQzo6SW50bERhdGVUaW1lRm9ybWF0UHJvdG90eXBlRnVuY1Jlc29s dmVkT3B0aW9ucyk6CisgICAgICAgICogcnVudGltZS9JbnRsTnVtYmVyRm9ybWF0Q29uc3RydWN0 b3IuY3BwOgorICAgICAgICAoSlNDOjpjb25zdHJ1Y3RJbnRsTnVtYmVyRm9ybWF0KToKKyAgICAg ICAgKEpTQzo6SW50bE51bWJlckZvcm1hdENvbnN0cnVjdG9yRnVuY1N1cHBvcnRlZExvY2FsZXNP Zik6CisgICAgICAgICogcnVudGltZS9JbnRsTnVtYmVyRm9ybWF0UHJvdG90eXBlLmNwcDoKKyAg ICAgICAgKEpTQzo6SW50bE51bWJlckZvcm1hdEZ1bmNGb3JtYXROdW1iZXIpOgorICAgICAgICAo SlNDOjpJbnRsTnVtYmVyRm9ybWF0UHJvdG90eXBlR2V0dGVyRm9ybWF0KToKKyAgICAgICAgKEpT Qzo6SW50bE51bWJlckZvcm1hdFByb3RvdHlwZUZ1bmNSZXNvbHZlZE9wdGlvbnMpOgorICAgICAg ICAqIHJ1bnRpbWUvSW50bE9iamVjdC5jcHA6CisgICAgICAgIChKU0M6Omxvb2t1cFN1cHBvcnRl ZExvY2FsZXMpOgorICAgICAgICAqIHJ1bnRpbWUvSW50bE9iamVjdElubGluZXMuaDoKKyAgICAg ICAgKEpTQzo6Y29uc3RydWN0SW50bEluc3RhbmNlV2l0aFdvcmthcm91bmRGb3JMZWdhY3lJbnRs Q29uc3RydWN0b3IpOgorCiAyMDE2LTExLTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNv bT4KIAogICAgICAgICBGaXggZXhjZXB0aW9uIHNjb3BlIHZlcmlmaWNhdGlvbiBmYWlsdXJlcyBp biBGdW5jdGlvbkNvbnN0cnVjdG9yLmNwcC4KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL0ludGxDb2xsYXRvckNvbnN0cnVjdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsQ29sbGF0b3JDb25zdHJ1Y3Rvci5jcHAJKHJldmlz aW9uIDIwODk1NikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxDb2xsYXRv ckNvbnN0cnVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTYsNiArOTYsNyBAQCBzdGF0aWMg RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjb25zCiAgICAgQVNTRVJUKGNvbGxhdG9yKTsK IAogICAgIC8vIDQuIFJldHVybiBJbml0aWFsaXplQ29sbGF0b3IoY29sbGF0b3IsIGxvY2FsZXMs IG9wdGlvbnMpLgorICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICBjb2xsYXRvci0+aW5pdGlhbGl6 ZUNvbGxhdG9yKCpzdGF0ZSwgc3RhdGUtPmFyZ3VtZW50KDApLCBzdGF0ZS0+YXJndW1lbnQoMSkp OwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoY29sbGF0b3IpOwogfQpAQCAtMTQ4LDYgKzE0 OSw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgSW50bENvbGxhdG8KIAogICAgIC8v IDMuIFJldHVybiBTdXBwb3J0ZWRMb2NhbGVzKCVDb2xsYXRvciUuW1thdmFpbGFibGVMb2NhbGVz XV0sIHJlcXVlc3RlZExvY2FsZXMsIG9wdGlvbnMpLgogICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9i YWxPYmplY3QgPSBzdGF0ZS0+Y2FsbGVlKCktPmdsb2JhbE9iamVjdCgpOworICAgIHNjb3BlLnJl bGVhc2UoKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHN1cHBvcnRlZExvY2FsZXMoKnN0 YXRlLCBnbG9iYWxPYmplY3QtPmludGxDb2xsYXRvckF2YWlsYWJsZUxvY2FsZXMoKSwgcmVxdWVz dGVkTG9jYWxlcywgc3RhdGUtPmFyZ3VtZW50KDEpKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL0ludGxDb2xsYXRvclByb3RvdHlwZS5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bENvbGxhdG9yUHJvdG90eXBlLmNw cAkocmV2aXNpb24gMjA4OTU2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50 bENvbGxhdG9yUHJvdG90eXBlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTQ1LDYgKzE0NSw3IEBA IEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgSW50bENvbGxhdG8KICAgICBpZiAoIWNvbGxh dG9yKQogICAgICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHRocm93VHlwZUVycm9yKHN0YXRl LCBzY29wZSwgQVNDSUlMaXRlcmFsKCJJbnRsLkNvbGxhdG9yLnByb3RvdHlwZS5yZXNvbHZlZE9w dGlvbnMgY2FsbGVkIG9uIHZhbHVlIHRoYXQncyBub3QgYW4gb2JqZWN0IGluaXRpYWxpemVkIGFz IGEgQ29sbGF0b3IiKSkpOwogCisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIHJldHVybiBKU1Zh bHVlOjplbmNvZGUoY29sbGF0b3ItPnJlc29sdmVkT3B0aW9ucygqc3RhdGUpKTsKIH0KIApJbmRl eDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bERhdGVUaW1lRm9ybWF0Q29uc3Ry dWN0b3IuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0lu dGxEYXRlVGltZUZvcm1hdENvbnN0cnVjdG9yLmNwcAkocmV2aXNpb24gMjA4OTU2KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bERhdGVUaW1lRm9ybWF0Q29uc3RydWN0b3Iu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Niw2ICs5Niw3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1 ZSBKU0NfSE9TVF9DQUxMIGNvbnMKICAgICBBU1NFUlQoZGF0ZVRpbWVGb3JtYXQpOwogCiAgICAg Ly8gNC4gUmV0dXJuIEluaXRpYWxpemVEYXRlVGltZUZvcm1hdChkYXRlVGltZUZvcm1hdCwgbG9j YWxlcywgb3B0aW9ucykuCisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIGRhdGVUaW1lRm9ybWF0 LT5pbml0aWFsaXplRGF0ZVRpbWVGb3JtYXQoKnN0YXRlLCBzdGF0ZS0+YXJndW1lbnQoMCksIHN0 YXRlLT5hcmd1bWVudCgxKSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShkYXRlVGltZUZv cm1hdCk7CiB9CkBAIC0xNDksNiArMTUwLDcgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FM TCBJbnRsRGF0ZVRpbQogICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGVuY29kZWRKU1Zh bHVlKCkpOwogCiAgICAgLy8gMy4gUmV0dXJuIFN1cHBvcnRlZExvY2FsZXMoYXZhaWxhYmxlTG9j YWxlcywgcmVxdWVzdGVkTG9jYWxlcywgb3B0aW9ucykuCisgICAgc2NvcGUucmVsZWFzZSgpOwog ICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoc3VwcG9ydGVkTG9jYWxlcygqc3RhdGUsIGF2YWls YWJsZUxvY2FsZXMsIHJlcXVlc3RlZExvY2FsZXMsIHN0YXRlLT5hcmd1bWVudCgxKSkpOwogfQog CkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9JbnRsRGF0ZVRpbWVGb3JtYXRQ cm90b3R5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0ludGxEYXRlVGltZUZvcm1hdFByb3RvdHlwZS5jcHAJKHJldmlzaW9uIDIwODk1NikKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxEYXRlVGltZUZvcm1hdFByb3RvdHlwZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw2ICsxMDUsNyBAQCBzdGF0aWMgRW5jb2RlZEpTVmFs dWUgSlNDX0hPU1RfQ0FMTCBJbnRsCiAgICAgfQogCiAgICAgLy8gNS4gUmV0dXJuIEZvcm1hdERh dGVUaW1lKGR0ZiwgeCkuCisgICAgc2NvcGUucmVsZWFzZSgpOwogICAgIHJldHVybiBKU1ZhbHVl OjplbmNvZGUoZm9ybWF0LT5mb3JtYXQoKnN0YXRlLCB2YWx1ZSkpOwogfQogCkBAIC0xMTksOCAr MTIwLDExIEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwgSW50bERhdGVUaW0KIAogICAg IC8vIEZJWE1FOiBXb3JrYXJvdW5kIHRvIHByb3ZpZGUgY29tcGF0aWJpbGl0eSB3aXRoIEVDTUEt NDAyIDEuMCBjYWxsL2FwcGx5IHBhdHRlcm5zLgogICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNTM2NzkKLSAgICBpZiAoIWR0ZikKLSAgICAgICAgZHRmID0g anNEeW5hbWljQ2FzdDxJbnRsRGF0ZVRpbWVGb3JtYXQqPihzdGF0ZS0+dGhpc1ZhbHVlKCkuZ2V0 KHN0YXRlLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS5pbnRsU3Vic3RpdHV0ZVZh bHVlUHJpdmF0ZU5hbWUoKSkpOworICAgIGlmICghZHRmKSB7CisgICAgICAgIEpTVmFsdWUgdmFs dWUgPSBzdGF0ZS0+dGhpc1ZhbHVlKCkuZ2V0KHN0YXRlLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWls dGluTmFtZXMoKS5pbnRsU3Vic3RpdHV0ZVZhbHVlUHJpdmF0ZU5hbWUoKSk7CisgICAgICAgIFJF VFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOworICAgICAgICBkdGYg PSBqc0R5bmFtaWNDYXN0PEludGxEYXRlVGltZUZvcm1hdCo+KHZhbHVlKTsKKyAgICB9CiAKICAg ICAvLyAyLiBSZXR1cm5JZkFicnVwdChkdGYpLgogICAgIGlmICghZHRmKQpAQCAtMTU3LDEyICsx NjEsMTYgQEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBJbnRsRGF0ZVRpbQogCiAgICAg Ly8gRklYTUU6IFdvcmthcm91bmQgdG8gcHJvdmlkZSBjb21wYXRpYmlsaXR5IHdpdGggRUNNQS00 MDIgMS4wIGNhbGwvYXBwbHkgcGF0dGVybnMuCiAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1MzY3OQotICAgIGlmICghZGF0ZVRpbWVGb3JtYXQpCi0gICAg ICAgIGRhdGVUaW1lRm9ybWF0ID0ganNEeW5hbWljQ2FzdDxJbnRsRGF0ZVRpbWVGb3JtYXQqPihz dGF0ZS0+dGhpc1ZhbHVlKCkuZ2V0KHN0YXRlLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFt ZXMoKS5pbnRsU3Vic3RpdHV0ZVZhbHVlUHJpdmF0ZU5hbWUoKSkpOworICAgIGlmICghZGF0ZVRp bWVGb3JtYXQpIHsKKyAgICAgICAgSlNWYWx1ZSB2YWx1ZSA9IHN0YXRlLT50aGlzVmFsdWUoKS5n ZXQoc3RhdGUsIHZtLnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmludGxTdWJzdGl0dXRl VmFsdWVQcml2YXRlTmFtZSgpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg ZW5jb2RlZEpTVmFsdWUoKSk7CisgICAgICAgIGRhdGVUaW1lRm9ybWF0ID0ganNEeW5hbWljQ2Fz dDxJbnRsRGF0ZVRpbWVGb3JtYXQqPih2YWx1ZSk7CisgICAgfQogCiAgICAgaWYgKCFkYXRlVGlt ZUZvcm1hdCkKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZSh0aHJvd1R5cGVFcnJvcihz dGF0ZSwgc2NvcGUsIEFTQ0lJTGl0ZXJhbCgiSW50bC5EYXRlVGltZUZvcm1hdC5wcm90b3R5cGUu cmVzb2x2ZWRPcHRpb25zIGNhbGxlZCBvbiB2YWx1ZSB0aGF0J3Mgbm90IGFuIG9iamVjdCBpbml0 aWFsaXplZCBhcyBhIERhdGVUaW1lRm9ybWF0IikpKTsKIAorICAgIHNjb3BlLnJlbGVhc2UoKTsK ICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGRhdGVUaW1lRm9ybWF0LT5yZXNvbHZlZE9wdGlv bnMoKnN0YXRlKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0lu dGxOdW1iZXJGb3JtYXRDb25zdHJ1Y3Rvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFT Y3JpcHRDb3JlL3J1bnRpbWUvSW50bE51bWJlckZvcm1hdENvbnN0cnVjdG9yLmNwcAkocmV2aXNp b24gMjA4OTU2KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE51bWJlckZv cm1hdENvbnN0cnVjdG9yLmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTYsNiArOTYsNyBAQCBzdGF0 aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjb25zCiAgICAgQVNTRVJUKG51bWJlckZv cm1hdCk7CiAKICAgICAvLyA0LiBSZXR1cm4gSW5pdGlhbGl6ZU51bWJlckZvcm1hdChudW1iZXJG b3JtYXQsIGxvY2FsZXMsIG9wdGlvbnMpLgorICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICBudW1i ZXJGb3JtYXQtPmluaXRpYWxpemVOdW1iZXJGb3JtYXQoKnN0YXRlLCBzdGF0ZS0+YXJndW1lbnQo MCksIHN0YXRlLT5hcmd1bWVudCgxKSk7CiAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZShudW1i ZXJGb3JtYXQpOwogfQpAQCAtMTQ5LDYgKzE1MCw3IEBAIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NU X0NBTEwgSW50bE51bWJlckYKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVk SlNWYWx1ZSgpKTsKIAogICAgIC8vIDMuIFJldHVybiBTdXBwb3J0ZWRMb2NhbGVzKGF2YWlsYWJs ZUxvY2FsZXMsIHJlcXVlc3RlZExvY2FsZXMsIG9wdGlvbnMpLgorICAgIHNjb3BlLnJlbGVhc2Uo KTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHN1cHBvcnRlZExvY2FsZXMoKnN0YXRlLCBh dmFpbGFibGVMb2NhbGVzLCByZXF1ZXN0ZWRMb2NhbGVzLCBzdGF0ZS0+YXJndW1lbnQoMSkpKTsK IH0KIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE51bWJlckZvcm1h dFByb3RvdHlwZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRp bWUvSW50bE51bWJlckZvcm1hdFByb3RvdHlwZS5jcHAJKHJldmlzaW9uIDIwODk1NikKKysrIFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0ludGxOdW1iZXJGb3JtYXRQcm90b3R5cGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC05NCw2ICs5NCw3IEBAIHN0YXRpYyBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIEludGwKICAgICBSRVRVUk5fSUZfRVhDRVBUSU9OKHNjb3BlLCBlbmNvZGVk SlNWYWx1ZSgpKTsKIAogICAgIC8vIDYuIFJldHVybiBGb3JtYXROdW1iZXIobmYsIHgpLgorICAg IHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKG51bWJlckZvcm1h dC0+Zm9ybWF0TnVtYmVyKCpzdGF0ZSwgbnVtYmVyKSk7CiB9CiAKQEAgLTEwOCw4ICsxMDksMTEg QEAgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBJbnRsTnVtYmVyRgogCiAgICAgLy8gRklY TUU6IFdvcmthcm91bmQgdG8gcHJvdmlkZSBjb21wYXRpYmlsaXR5IHdpdGggRUNNQS00MDIgMS4w IGNhbGwvYXBwbHkgcGF0dGVybnMuCiAgICAgLy8gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE1MzY3OQotICAgIGlmICghbmYpCi0gICAgICAgIG5mID0ganNEeW5hbWlj Q2FzdDxJbnRsTnVtYmVyRm9ybWF0Kj4oc3RhdGUtPnRoaXNWYWx1ZSgpLmdldChzdGF0ZSwgdm0u cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkuaW50bFN1YnN0aXR1dGVWYWx1ZVByaXZhdGVO YW1lKCkpKTsKKyAgICBpZiAoIW5mKSB7CisgICAgICAgIEpTVmFsdWUgdmFsdWUgPSBzdGF0ZS0+ dGhpc1ZhbHVlKCkuZ2V0KHN0YXRlLCB2bS5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS5p bnRsU3Vic3RpdHV0ZVZhbHVlUHJpdmF0ZU5hbWUoKSk7CisgICAgICAgIFJFVFVSTl9JRl9FWENF UFRJT04oc2NvcGUsIGVuY29kZWRKU1ZhbHVlKCkpOworICAgICAgICBuZiA9IGpzRHluYW1pY0Nh c3Q8SW50bE51bWJlckZvcm1hdCo+KHZhbHVlKTsKKyAgICB9CiAKICAgICBpZiAoIW5mKQogICAg ICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKHRocm93VHlwZUVycm9yKHN0YXRlLCBzY29wZSwg QVNDSUlMaXRlcmFsKCJJbnRsLk51bWJlckZvcm1hdC5wcm90b3R5cGUuZm9ybWF0IGNhbGxlZCBv biB2YWx1ZSB0aGF0J3Mgbm90IGFuIG9iamVjdCBpbml0aWFsaXplZCBhcyBhIE51bWJlckZvcm1h dCIpKSk7CkBAIC0xNDUsMTIgKzE0OSwxNiBAQCBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxM IEludGxOdW1iZXJGCiAKICAgICAvLyBGSVhNRTogV29ya2Fyb3VuZCB0byBwcm92aWRlIGNvbXBh dGliaWxpdHkgd2l0aCBFQ01BLTQwMiAxLjAgY2FsbC9hcHBseSBwYXR0ZXJucy4KICAgICAvLyBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTUzNjc5Ci0gICAgaWYgKCFu dW1iZXJGb3JtYXQpCi0gICAgICAgIG51bWJlckZvcm1hdCA9IGpzRHluYW1pY0Nhc3Q8SW50bE51 bWJlckZvcm1hdCo+KHN0YXRlLT50aGlzVmFsdWUoKS5nZXQoc3RhdGUsIHZtLnByb3BlcnR5TmFt ZXMtPmJ1aWx0aW5OYW1lcygpLmludGxTdWJzdGl0dXRlVmFsdWVQcml2YXRlTmFtZSgpKSk7Cisg ICAgaWYgKCFudW1iZXJGb3JtYXQpIHsKKyAgICAgICAgSlNWYWx1ZSB2YWx1ZSA9IHN0YXRlLT50 aGlzVmFsdWUoKS5nZXQoc3RhdGUsIHZtLnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmlu dGxTdWJzdGl0dXRlVmFsdWVQcml2YXRlTmFtZSgpKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQ VElPTihzY29wZSwgZW5jb2RlZEpTVmFsdWUoKSk7CisgICAgICAgIG51bWJlckZvcm1hdCA9IGpz RHluYW1pY0Nhc3Q8SW50bE51bWJlckZvcm1hdCo+KHZhbHVlKTsKKyAgICB9CiAKICAgICBpZiAo IW51bWJlckZvcm1hdCkKICAgICAgICAgcmV0dXJuIEpTVmFsdWU6OmVuY29kZSh0aHJvd1R5cGVF cnJvcihzdGF0ZSwgc2NvcGUsIEFTQ0lJTGl0ZXJhbCgiSW50bC5OdW1iZXJGb3JtYXQucHJvdG90 eXBlLnJlc29sdmVkT3B0aW9ucyBjYWxsZWQgb24gdmFsdWUgdGhhdCdzIG5vdCBhbiBvYmplY3Qg aW5pdGlhbGl6ZWQgYXMgYSBOdW1iZXJGb3JtYXQiKSkpOwogCisgICAgc2NvcGUucmVsZWFzZSgp OwogICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUobnVtYmVyRm9ybWF0LT5yZXNvbHZlZE9wdGlv bnMoKnN0YXRlKSk7CiB9CiAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0lu dGxPYmplY3QuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1l L0ludGxPYmplY3QuY3BwCShyZXZpc2lvbiAyMDg5NTYpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9JbnRsT2JqZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTA4LDggKzkwOCwx MCBAQCBzdGF0aWMgSlNBcnJheSogbG9va3VwU3VwcG9ydGVkTG9jYWxlcyhFCiAgICAgICAgIFN0 cmluZyBhdmFpbGFibGVMb2NhbGUgPSBiZXN0QXZhaWxhYmxlTG9jYWxlKGF2YWlsYWJsZUxvY2Fs ZXMsIG5vRXh0ZW5zaW9uc0xvY2FsZSk7CiAKICAgICAgICAgLy8gZi4gSWYgYXZhaWxhYmxlTG9j YWxlIGlzIG5vdCB1bmRlZmluZWQsIHRoZW4gYXBwZW5kIGxvY2FsZSB0byB0aGUgZW5kIG9mIHN1 YnNldC4KLSAgICAgICAgaWYgKCFhdmFpbGFibGVMb2NhbGUuaXNOdWxsKCkpCisgICAgICAgIGlm ICghYXZhaWxhYmxlTG9jYWxlLmlzTnVsbCgpKSB7CiAgICAgICAgICAgICBzdWJzZXQtPnB1c2go JnN0YXRlLCBqc1N0cmluZygmc3RhdGUsIGxvY2FsZSkpOworICAgICAgICAgICAgUkVUVVJOX0lG X0VYQ0VQVElPTihzY29wZSwgbnVsbHB0cik7CisgICAgICAgIH0KIAogICAgICAgICAvLyBnLiBJ bmNyZW1lbnQgayBieSAxLgogICAgIH0KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50 aW1lL0ludGxPYmplY3RJbmxpbmVzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRD b3JlL3J1bnRpbWUvSW50bE9iamVjdElubGluZXMuaAkocmV2aXNpb24gMjA4OTU2KQorKysgU291 cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSW50bE9iamVjdElubGluZXMuaAkod29ya2luZyBj b3B5KQpAQCAtNDQsNyArNDQsOSBAQCBKU1ZhbHVlIGNvbnN0cnVjdEludGxJbnN0YW5jZVdpdGhX b3JrYXJvCiAKICAgICBpZiAoIWpzRHluYW1pY0Nhc3Q8SW50bEluc3RhbmNlKj4odGhpc1ZhbHVl KSkgewogICAgICAgICBKU1ZhbHVlIHByb3RvdHlwZSA9IGNhbGxlZS0+Z2V0RGlyZWN0KHZtLCB2 bS5wcm9wZXJ0eU5hbWVzLT5wcm90b3R5cGUpOwotICAgICAgICBpZiAoSlNPYmplY3Q6OmRlZmF1 bHRIYXNJbnN0YW5jZSgmc3RhdGUsIHRoaXNWYWx1ZSwgcHJvdG90eXBlKSkgeworICAgICAgICBi b29sIGhhc0luc3RhbmNlID0gSlNPYmplY3Q6OmRlZmF1bHRIYXNJbnN0YW5jZSgmc3RhdGUsIHRo aXNWYWx1ZSwgcHJvdG90eXBlKTsKKyAgICAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg SlNWYWx1ZSgpKTsKKyAgICAgICAgaWYgKGhhc0luc3RhbmNlKSB7CiAgICAgICAgICAgICBKU09i amVjdCogdGhpc09iamVjdCA9IHRoaXNWYWx1ZS50b09iamVjdCgmc3RhdGUpOwogICAgICAgICAg ICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwgSlNWYWx1ZSgpKTsKIApAQCAtNTUsNyArNTcs NyBAQCBKU1ZhbHVlIGNvbnN0cnVjdEludGxJbnN0YW5jZVdpdGhXb3JrYXJvCiAgICAgICAgICAg ICByZXR1cm4gdGhpc09iamVjdDsKICAgICAgICAgfQogICAgIH0KLQorICAgIHNjb3BlLnJlbGVh c2UoKTsKICAgICByZXR1cm4gZmFjdG9yeSh2bSk7CiB9CiAK