164975 2016-11-18 17:28:50 -0800 Fix exception scope verification failures in CommonSlowPaths.cpp/h. 2016-11-20 17:33:22 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 162351 1 mark.lam mark.lam commit-queue fpizlo ggaren jfbastien keith_miller msaboff saam ysuzuki oldest_to_newest 1252978 0 mark.lam 2016-11-18 17:28:50 -0800 Patch coming. 1252979 1 295232 mark.lam 2016-11-18 17:32:19 -0800 Created attachment 295232 proposed patch. 1253172 2 295232 commit-queue 2016-11-20 17:33:18 -0800 Comment on attachment 295232 proposed patch. Clearing flags on attachment: 295232 Committed r208936: <http://trac.webkit.org/changeset/208936> 1253173 3 commit-queue 2016-11-20 17:33:22 -0800 All reviewed patches have been landed. Closing bug. 295232 2016-11-18 17:32:19 -0800 2016-11-20 17:33:18 -0800 proposed patch. bug-164975.patch text/plain 3448 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4OTExKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBA CisyMDE2LTExLTE4ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggZXhjZXB0aW9uIHNjb3BlIHZlcmlmaWNhdGlvbiBmYWlsdXJlcyBpbiBDb21tb25TbG93UGF0 aHMuY3BwL2guCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xNjQ5NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHJ1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmNwcDoKKyAgICAgICAgKEpTQzo6U0xPV19QQVRI X0RFQ0wpOgorICAgICAgICAqIHJ1bnRpbWUvQ29tbW9uU2xvd1BhdGhzLmg6CisgICAgICAgIChK U0M6OkNvbW1vblNsb3dQYXRoczo6b3BJbik6CisKIDIwMTYtMTEtMTggIEplcmVteSBKb25lcyAg PGplcmVteWpAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBydW50aW1lIGZsYWcgdG8gZW5hYmxl IHBvaW50ZXIgbG9jay4gRW5hYmxlIHBvaW50ZXIgbG9jayBmZWF0dXJlIGZvciBtYWMuCkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNsb3dQYXRocy5j cHAJKHJldmlzaW9uIDIwODkwNSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Nv bW1vblNsb3dQYXRocy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4MSw2ICsxODEsNyBAQCBTTE9X X1BBVEhfREVDTChzbG93X3BhdGhfY2FsbF9hcml0eUNoZWNrCiAgICAgICAgIGV4ZWMgPSBleGVj LT5jYWxsZXJGcmFtZSgpOwogICAgICAgICB2bS50b3BDYWxsRnJhbWUgPSBleGVjOwogICAgICAg ICBFcnJvckhhbmRsaW5nU2NvcGUgZXJyb3JTY29wZSh2bSk7CisgICAgICAgIHRocm93U2NvcGUu cmVsZWFzZSgpOwogICAgICAgICBDb21tb25TbG93UGF0aHM6OmludGVycHJldGVyVGhyb3dJbkNh bGxlcihleGVjLCBjcmVhdGVTdGFja092ZXJmbG93RXJyb3IoZXhlYykpOwogICAgICAgICBSRVRV Uk5fVFdPKGJpdHdpc2VfY2FzdDx2b2lkKj4oc3RhdGljX2Nhc3Q8dWludHB0cl90PigxKSksIGV4 ZWMpOwogICAgIH0KQEAgLTQ0Myw5ICs0NDQsMTEgQEAgU0xPV19QQVRIX0RFQ0woc2xvd19wYXRo X2FkZCkKICAgICBBcml0aFByb2ZpbGUmIGFyaXRoUHJvZmlsZSA9ICpleGVjLT5jb2RlQmxvY2so KS0+YXJpdGhQcm9maWxlRm9yUEMocGMpOwogICAgIGFyaXRoUHJvZmlsZS5vYnNlcnZlTEhTQW5k UkhTKHYxLCB2Mik7CiAKLSAgICBpZiAodjEuaXNTdHJpbmcoKSAmJiAhdjIuaXNPYmplY3QoKSkK LSAgICAgICAgcmVzdWx0ID0ganNTdHJpbmcoZXhlYywgYXNTdHJpbmcodjEpLCB2Mi50b1N0cmlu ZyhleGVjKSk7Ci0gICAgZWxzZSBpZiAodjEuaXNOdW1iZXIoKSAmJiB2Mi5pc051bWJlcigpKQor ICAgIGlmICh2MS5pc1N0cmluZygpICYmICF2Mi5pc09iamVjdCgpKSB7CisgICAgICAgIEpTU3Ry aW5nKiB2MlN0cmluZyA9IHYyLnRvU3RyaW5nKGV4ZWMpOworICAgICAgICBpZiAoTElLRUxZKCF0 aHJvd1Njb3BlLmV4Y2VwdGlvbigpKSkKKyAgICAgICAgICAgIHJlc3VsdCA9IGpzU3RyaW5nKGV4 ZWMsIGFzU3RyaW5nKHYxKSwgdjJTdHJpbmcpOworICAgIH0gZWxzZSBpZiAodjEuaXNOdW1iZXIo KSAmJiB2Mi5pc051bWJlcigpKQogICAgICAgICByZXN1bHQgPSBqc051bWJlcih2MS5hc051bWJl cigpICsgdjIuYXNOdW1iZXIoKSk7CiAgICAgZWxzZQogICAgICAgICByZXN1bHQgPSBqc0FkZFNs b3dDYXNlKGV4ZWMsIHYxLCB2Mik7CkBAIC04MjQsNyArODI3LDkgQEAgU0xPV19QQVRIX0RFQ0wo c2xvd19wYXRoX3Jlc29sdmVfc2NvcGUpCiAgICAgaWYgKHJlc29sdmVUeXBlID09IFVucmVzb2x2 ZWRQcm9wZXJ0eSB8fCByZXNvbHZlVHlwZSA9PSBVbnJlc29sdmVkUHJvcGVydHlXaXRoVmFySW5q ZWN0aW9uQ2hlY2tzKSB7CiAgICAgICAgIGlmIChyZXNvbHZlZFNjb3BlLT5pc0dsb2JhbE9iamVj dCgpKSB7CiAgICAgICAgICAgICBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0ID0ganNDYXN0 PEpTR2xvYmFsT2JqZWN0Kj4ocmVzb2x2ZWRTY29wZSk7Ci0gICAgICAgICAgICBpZiAoZ2xvYmFs T2JqZWN0LT5oYXNQcm9wZXJ0eShleGVjLCBpZGVudCkpIHsKKyAgICAgICAgICAgIGJvb2wgaGFz UHJvcGVydHkgPSBnbG9iYWxPYmplY3QtPmhhc1Byb3BlcnR5KGV4ZWMsIGlkZW50KTsKKyAgICAg ICAgICAgIENIRUNLX0VYQ0VQVElPTigpOworICAgICAgICAgICAgaWYgKGhhc1Byb3BlcnR5KSB7 CiAgICAgICAgICAgICAgICAgQ29uY3VycmVudEpTTG9ja2VyIGxvY2tlcihleGVjLT5jb2RlQmxv Y2soKS0+bV9sb2NrKTsKICAgICAgICAgICAgICAgICBpZiAocmVzb2x2ZVR5cGUgPT0gVW5yZXNv bHZlZFByb3BlcnR5KQogICAgICAgICAgICAgICAgICAgICBwY1s0XS51Lm9wZXJhbmQgPSBHbG9i YWxQcm9wZXJ0eTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0NvbW1vblNs b3dQYXRocy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0Nv bW1vblNsb3dQYXRocy5oCShyZXZpc2lvbiAyMDg5MDUpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuaAkod29ya2luZyBjb3B5KQpAQCAtODMsMTEgKzgz LDE0IEBAIGlubGluZSBib29sIG9wSW4oRXhlY1N0YXRlKiBleGVjLCBKU1ZhbHUKICAgICBKU09i amVjdCogYmFzZU9iaiA9IGFzT2JqZWN0KGJhc2VWYWwpOwogCiAgICAgdWludDMyX3QgaTsKLSAg ICBpZiAocHJvcE5hbWUuZ2V0VUludDMyKGkpKQorICAgIGlmIChwcm9wTmFtZS5nZXRVSW50MzIo aSkpIHsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICByZXR1cm4gYmFzZU9iai0+ aGFzUHJvcGVydHkoZXhlYywgaSk7CisgICAgfQogCiAgICAgYXV0byBwcm9wZXJ0eSA9IHByb3BO YW1lLnRvUHJvcGVydHlLZXkoZXhlYyk7CiAgICAgUkVUVVJOX0lGX0VYQ0VQVElPTihzY29wZSwg ZmFsc2UpOworICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICByZXR1cm4gYmFzZU9iai0+aGFzUHJv cGVydHkoZXhlYywgcHJvcGVydHkpOwogfQogCg==