164831 2016-11-16 12:53:03 -0800 Fix exception scope checking in JSGlobalObject.cpp. 2016-11-16 13:06:20 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mark.lam mark.lam commit-queue keith_miller msaboff saam oldest_to_newest 1251977 0 mark.lam 2016-11-16 12:53:03 -0800 Patch coming. 1251978 1 294965 mark.lam 2016-11-16 12:57:41 -0800 Created attachment 294965 proposed patch. 1251990 2 mark.lam 2016-11-16 13:06:20 -0800 Thanks for the review. Landed in r208808: <http://trac.webkit.org/r208808>. 294965 2016-11-16 12:57:41 -0800 2016-11-16 13:03:42 -0800 proposed patch. bug-164831.patch text/plain 5371 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4Nzk5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBA CisyMDE2LTExLTE2ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggZXhjZXB0aW9uIHNjb3BlIGNoZWNraW5nIGluIEpTR2xvYmFsT2JqZWN0LmNwcC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NDgzMQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcnVudGltZS9KU0ds b2JhbE9iamVjdC5jcHA6CisgICAgICAgIChKU0M6OkpTR2xvYmFsT2JqZWN0Ojppbml0KToKKyAg ICAgICAgLSBVc2UgYSBDYXRjaFNjb3BlIGhlcmUgYmVjYXVzZSB3ZSBkb24ndCBldmVyIGV4cGVj dCBKU0dsb2JhbE9iamVjdCBpbml0aWFsaXphdGlvbgorICAgICAgICAgIHRvIGZhaWwgd2l0aCBl cnJvcnMuCisgICAgICAgIChKU0M6OkpTR2xvYmFsT2JqZWN0OjpwdXQpOgorICAgICAgICAtIEZp eCBleGNlcHRpb24gY2hlY2sgcmVxdWlyZW1lbnRzLgorCiAyMDE2LTExLTE2ICBLZWl0aCBNaWxs ZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIEFSTSBi dWlsZCBmaXguCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9i amVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNH bG9iYWxPYmplY3QuY3BwCShyZXZpc2lvbiAyMDg3OTkpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1OCw2ICsz NTgsNyBAQCBzdGF0aWMgSlNPYmplY3QqIGdldEdldHRlckJ5SWQoRXhlY1N0YXRlCiB2b2lkIEpT R2xvYmFsT2JqZWN0Ojppbml0KFZNJiB2bSkKIHsKICAgICBBU1NFUlQodm0uY3VycmVudFRocmVh ZElzSG9sZGluZ0FQSUxvY2soKSk7CisgICAgYXV0byBjYXRjaFNjb3BlID0gREVDTEFSRV9DQVRD SF9TQ09QRSh2bSk7CiAKICAgICBCYXNlOjpzZXRTdHJ1Y3R1cmUodm0sIFN0cnVjdHVyZTo6dG9D YWNoZWFibGVEaWN0aW9uYXJ5VHJhbnNpdGlvbih2bSwgc3RydWN0dXJlKCkpKTsKIApAQCAtNzQw LDEzICs3NDEsMjAgQEAgcHV0RGlyZWN0V2l0aG91dFRyYW5zaXRpb24odm0sIHZtLnByb3Blcgog ICAgIEpTRnVuY3Rpb24qIHByaXZhdGVGdW5jQ29uY2F0U2xvd1BhdGggPSBKU0Z1bmN0aW9uOjpj cmVhdGVCdWlsdGluRnVuY3Rpb24odm0sIGFycmF5UHJvdG90eXBlQ29uY2F0U2xvd1BhdGhDb2Rl R2VuZXJhdG9yKHZtKSwgdGhpcyk7CiAKICAgICBKU09iamVjdCogcmVnRXhwUHJvdG9GbGFnc0dl dHRlck9iamVjdCA9IGdldEdldHRlckJ5SWQoZXhlYywgbV9yZWdFeHBQcm90b3R5cGUuZ2V0KCks IHZtLnByb3BlcnR5TmFtZXMtPmZsYWdzKTsKKyAgICBBU1NFUlRfVU5VU0VEKGNhdGNoU2NvcGUs ICFjYXRjaFNjb3BlLmV4Y2VwdGlvbigpKTsKICAgICBKU09iamVjdCogcmVnRXhwUHJvdG9HbG9i YWxHZXR0ZXJPYmplY3QgPSBnZXRHZXR0ZXJCeUlkKGV4ZWMsIG1fcmVnRXhwUHJvdG90eXBlLmdl dCgpLCB2bS5wcm9wZXJ0eU5hbWVzLT5nbG9iYWwpOworICAgIEFTU0VSVCghY2F0Y2hTY29wZS5l eGNlcHRpb24oKSk7CiAgICAgbV9yZWdFeHBQcm90b0dsb2JhbEdldHRlci5zZXQodm0sIHRoaXMs IHJlZ0V4cFByb3RvR2xvYmFsR2V0dGVyT2JqZWN0KTsKICAgICBKU09iamVjdCogcmVnRXhwUHJv dG9JZ25vcmVDYXNlR2V0dGVyT2JqZWN0ID0gZ2V0R2V0dGVyQnlJZChleGVjLCBtX3JlZ0V4cFBy b3RvdHlwZS5nZXQoKSwgdm0ucHJvcGVydHlOYW1lcy0+aWdub3JlQ2FzZSk7CisgICAgQVNTRVJU KCFjYXRjaFNjb3BlLmV4Y2VwdGlvbigpKTsKICAgICBKU09iamVjdCogcmVnRXhwUHJvdG9NdWx0 aWxpbmVHZXR0ZXJPYmplY3QgPSBnZXRHZXR0ZXJCeUlkKGV4ZWMsIG1fcmVnRXhwUHJvdG90eXBl LmdldCgpLCB2bS5wcm9wZXJ0eU5hbWVzLT5tdWx0aWxpbmUpOworICAgIEFTU0VSVCghY2F0Y2hT Y29wZS5leGNlcHRpb24oKSk7CiAgICAgSlNPYmplY3QqIHJlZ0V4cFByb3RvU291cmNlR2V0dGVy T2JqZWN0ID0gZ2V0R2V0dGVyQnlJZChleGVjLCBtX3JlZ0V4cFByb3RvdHlwZS5nZXQoKSwgdm0u cHJvcGVydHlOYW1lcy0+c291cmNlKTsKKyAgICBBU1NFUlQoIWNhdGNoU2NvcGUuZXhjZXB0aW9u KCkpOwogICAgIEpTT2JqZWN0KiByZWdFeHBQcm90b1N0aWNreUdldHRlck9iamVjdCA9IGdldEdl dHRlckJ5SWQoZXhlYywgbV9yZWdFeHBQcm90b3R5cGUuZ2V0KCksIHZtLnByb3BlcnR5TmFtZXMt PnN0aWNreSk7CisgICAgQVNTRVJUKCFjYXRjaFNjb3BlLmV4Y2VwdGlvbigpKTsKICAgICBKU09i amVjdCogcmVnRXhwUHJvdG9Vbmljb2RlR2V0dGVyT2JqZWN0ID0gZ2V0R2V0dGVyQnlJZChleGVj LCBtX3JlZ0V4cFByb3RvdHlwZS5nZXQoKSwgdm0ucHJvcGVydHlOYW1lcy0+dW5pY29kZSk7Cisg ICAgQVNTRVJUKCFjYXRjaFNjb3BlLmV4Y2VwdGlvbigpKTsKICAgICBtX3JlZ0V4cFByb3RvVW5p Y29kZUdldHRlci5zZXQodm0sIHRoaXMsIHJlZ0V4cFByb3RvVW5pY29kZUdldHRlck9iamVjdCk7 CiAgICAgSlNPYmplY3QqIGJ1aWx0aW5SZWdFeHBFeGVjID0gYXNPYmplY3QobV9yZWdFeHBQcm90 b3R5cGUtPmdldERpcmVjdCh2bSwgdm0ucHJvcGVydHlOYW1lcy0+ZXhlYykuYXNDZWxsKCkpOwog ICAgIG1fcmVnRXhwUHJvdG9FeGVjLnNldCh2bSwgdGhpcywgYnVpbHRpblJlZ0V4cEV4ZWMpOwpA QCAtODkzLDE3ICs5MDEsMTYgQEAgcHV0RGlyZWN0V2l0aG91dFRyYW5zaXRpb24odm0sIHZtLnBy b3BlcgogCiAgICAgewogICAgICAgICBFeGVjU3RhdGUqIGV4ZWMgPSBnbG9iYWxFeGVjKCk7Ci0g ICAgICAgIGF1dG8gc2NvcGUgPSBERUNMQVJFX1RIUk9XX1NDT1BFKHZtKTsKIAogICAgICAgICBh dXRvIHNldHVwQWRhcHRpdmVXYXRjaHBvaW50ID0gWyZdIChKU09iamVjdCogYmFzZSwgY29uc3Qg SWRlbnRpZmllciYgaWRlbnQpIC0+IE9iamVjdFByb3BlcnR5Q29uZGl0aW9uIHsKICAgICAgICAg ICAgIC8vIFBlcmZvcm1pbmcgdGhlc2UgZ2V0cyBzaG91bGQgbm90IHRocm93LgogICAgICAgICAg ICAgUHJvcGVydHlTbG90IHNsb3QoYmFzZSwgUHJvcGVydHlTbG90OjpJbnRlcm5hbE1ldGhvZFR5 cGU6OkdldCk7CiAgICAgICAgICAgICBib29sIHJlc3VsdCA9IGJhc2UtPmdldE93blByb3BlcnR5 U2xvdChiYXNlLCBleGVjLCBpZGVudCwgc2xvdCk7CiAgICAgICAgICAgICBBU1NFUlRfVU5VU0VE KHJlc3VsdCwgcmVzdWx0KTsKLSAgICAgICAgICAgIEFTU0VSVF9VTlVTRUQoc2NvcGUsICFzY29w ZS5leGNlcHRpb24oKSk7CisgICAgICAgICAgICBBU1NFUlQoIWNhdGNoU2NvcGUuZXhjZXB0aW9u KCkpOwogICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoc2xvdC5pc0NhY2hlYWJsZVZhbHVlKCkp OwogICAgICAgICAgICAgSlNWYWx1ZSBmdW5jdGlvblZhbHVlID0gc2xvdC5nZXRWYWx1ZShleGVj LCBpZGVudCk7Ci0gICAgICAgICAgICBBU1NFUlRfVU5VU0VEKHNjb3BlLCAhc2NvcGUuZXhjZXB0 aW9uKCkpOworICAgICAgICAgICAgQVNTRVJUKCFjYXRjaFNjb3BlLmV4Y2VwdGlvbigpKTsKICAg ICAgICAgICAgIEFTU0VSVChqc0R5bmFtaWNDYXN0PEpTRnVuY3Rpb24qPihmdW5jdGlvblZhbHVl KSk7CiAKICAgICAgICAgICAgIE9iamVjdFByb3BlcnR5Q29uZGl0aW9uIGNvbmRpdGlvbiA9IGdl bmVyYXRlQ29uZGl0aW9uRm9yU2VsZkVxdWl2YWxlbmNlKG1fdm0sIG51bGxwdHIsIGJhc2UsIGlk ZW50LmltcGwoKSk7CkBAIC05MzQsMTcgKzk0MSwyNCBAQCBwdXREaXJlY3RXaXRob3V0VHJhbnNp dGlvbih2bSwgdm0ucHJvcGVyCiAKIGJvb2wgSlNHbG9iYWxPYmplY3Q6OnB1dChKU0NlbGwqIGNl bGwsIEV4ZWNTdGF0ZSogZXhlYywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgSlNWYWx1ZSB2 YWx1ZSwgUHV0UHJvcGVydHlTbG90JiBzbG90KQogeworICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7 CisgICAgYXV0byBzY29wZSA9IERFQ0xBUkVfVEhST1dfU0NPUEUodm0pOwogICAgIEpTR2xvYmFs T2JqZWN0KiB0aGlzT2JqZWN0ID0ganNDYXN0PEpTR2xvYmFsT2JqZWN0Kj4oY2VsbCk7CiAgICAg QVNTRVJUKCFIZWFwOjpoZWFwKHZhbHVlKSB8fCBIZWFwOjpoZWFwKHZhbHVlKSA9PSBIZWFwOjpo ZWFwKHRoaXNPYmplY3QpKTsKIAotICAgIGlmIChVTkxJS0VMWShpc1RoaXNWYWx1ZUFsdGVyZWQo c2xvdCwgdGhpc09iamVjdCkpKQorICAgIGlmIChVTkxJS0VMWShpc1RoaXNWYWx1ZUFsdGVyZWQo c2xvdCwgdGhpc09iamVjdCkpKSB7CisgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAg cmV0dXJuIG9yZGluYXJ5U2V0U2xvdyhleGVjLCB0aGlzT2JqZWN0LCBwcm9wZXJ0eU5hbWUsIHZh bHVlLCBzbG90LnRoaXNWYWx1ZSgpLCBzbG90LmlzU3RyaWN0TW9kZSgpKTsKKyAgICB9CiAKICAg ICBib29sIHNob3VsZFRocm93UmVhZE9ubHlFcnJvciA9IHNsb3QuaXNTdHJpY3RNb2RlKCk7CiAg ICAgYm9vbCBpZ25vcmVSZWFkT25seUVycm9ycyA9IGZhbHNlOwogICAgIGJvb2wgcHV0UmVzdWx0 ID0gZmFsc2U7Ci0gICAgaWYgKHN5bWJvbFRhYmxlUHV0VG91Y2hXYXRjaHBvaW50U2V0KHRoaXNP YmplY3QsIGV4ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUsIHNob3VsZFRocm93UmVhZE9ubHlFcnJv ciwgaWdub3JlUmVhZE9ubHlFcnJvcnMsIHB1dFJlc3VsdCkpCisgICAgYm9vbCBkb25lID0gc3lt Ym9sVGFibGVQdXRUb3VjaFdhdGNocG9pbnRTZXQodGhpc09iamVjdCwgZXhlYywgcHJvcGVydHlO YW1lLCB2YWx1ZSwgc2hvdWxkVGhyb3dSZWFkT25seUVycm9yLCBpZ25vcmVSZWFkT25seUVycm9y cywgcHV0UmVzdWx0KTsKKyAgICBBU1NFUlQoKCEhc2NvcGUuZXhjZXB0aW9uKCkgPT0gKGRvbmUg JiYgIXB1dFJlc3VsdCkpIHx8ICFzaG91bGRUaHJvd1JlYWRPbmx5RXJyb3IpOworICAgIGlmIChk b25lKQogICAgICAgICByZXR1cm4gcHV0UmVzdWx0OworICAgIHNjb3BlLnJlbGVhc2UoKTsKICAg ICByZXR1cm4gQmFzZTo6cHV0KHRoaXNPYmplY3QsIGV4ZWMsIHByb3BlcnR5TmFtZSwgdmFsdWUs IHNsb3QpOwogfQogCg==