165021 2016-11-21 19:43:35 -0800 Fix exception scope verification failures in JSFunction.cpp. 2016-11-28 15:39:06 -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 1253329 0 mark.lam 2016-11-21 19:43:35 -0800 Patch coming. 1253330 1 295323 mark.lam 2016-11-21 19:46:37 -0800 Created attachment 295323 proposed patch. 1254058 2 mark.lam 2016-11-28 15:39:06 -0800 Thanks for the review. Landed in r209032: <http://trac.webkit.org/r209032>. 295323 2016-11-21 19:46:37 -0800 2016-11-28 14:19:00 -0800 proposed patch. bug-165021.patch text/plain 5358 mark.lam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjA4OTU3KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE2LTExLTIxICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KKworICAgICAgICBG aXggZXhjZXB0aW9uIHNjb3BlIHZlcmlmaWNhdGlvbiBmYWlsdXJlcyBpbiBKU0Z1bmN0aW9uLmNw cC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTAy MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcnVu dGltZS9KU0Z1bmN0aW9uLmNwcDoKKyAgICAgICAgKEpTQzo6SlNGdW5jdGlvbjo6cHV0KToKKyAg ICAgICAgKEpTQzo6SlNGdW5jdGlvbjo6ZGVmaW5lT3duUHJvcGVydHkpOgorCiAyMDE2LTExLTIx ICBNYXJrIExhbSAgPG1hcmsubGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmVkIGFuIGV4 dHJhIHNwYWNlIGNoYXJhY3RlciBhdCB0aGUgZW5kIG9mIGxpbmUuCkluZGV4OiBTb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0Z1bmN0aW9uLmNwcAkocmV2aXNpb24gMjA4OTU2KQor KysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNGdW5jdGlvbi5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTQyNSwxMyArNDI1LDE2IEBAIGJvb2wgSlNGdW5jdGlvbjo6cHV0KEpTQ2VsbCog Y2VsbCwgRXhlY1MKIAogICAgIEpTRnVuY3Rpb24qIHRoaXNPYmplY3QgPSBqc0Nhc3Q8SlNGdW5j dGlvbio+KGNlbGwpOwogCi0gICAgaWYgKFVOTElLRUxZKGlzVGhpc1ZhbHVlQWx0ZXJlZChzbG90 LCB0aGlzT2JqZWN0KSkpCisgICAgaWYgKFVOTElLRUxZKGlzVGhpc1ZhbHVlQWx0ZXJlZChzbG90 LCB0aGlzT2JqZWN0KSkpIHsKKyAgICAgICAgc2NvcGUucmVsZWFzZSgpOwogICAgICAgICByZXR1 cm4gb3JkaW5hcnlTZXRTbG93KGV4ZWMsIHRoaXNPYmplY3QsIHByb3BlcnR5TmFtZSwgdmFsdWUs IHNsb3QudGhpc1ZhbHVlKCksIHNsb3QuaXNTdHJpY3RNb2RlKCkpOworICAgIH0KIAogICAgIGlm ICh0aGlzT2JqZWN0LT5pc0hvc3RPckJ1aWx0aW5GdW5jdGlvbigpKSB7CiAgICAgICAgIExhenlQ cm9wZXJ0eVR5cGUgcHJvcFR5cGUgPSB0aGlzT2JqZWN0LT5yZWlmeUJvdW5kTmFtZUlmTmVlZGVk KHZtLCBleGVjLCBwcm9wZXJ0eU5hbWUpOwogICAgICAgICBpZiAocHJvcFR5cGUgPT0gTGF6eVBy b3BlcnR5VHlwZTo6SXNMYXp5UHJvcGVydHkpCiAgICAgICAgICAgICBzbG90LmRpc2FibGVDYWNo aW5nKCk7CisgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAgICAgICAgcmV0dXJuIEJhc2U6OnB1 dCh0aGlzT2JqZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWUsIHZhbHVlLCBzbG90KTsKICAgICB9CiAK QEAgLTQ1NCw2ICs0NTcsNyBAQCBib29sIEpTRnVuY3Rpb246OnB1dChKU0NlbGwqIGNlbGwsIEV4 ZWNTCiAgICAgICAgICAgICAvLyBGSVhNRTogSW52ZXN0aWdhdGUgaWYgdGhlIGBoYXNQcm9wZXJ0 eSgpYCBjYWxsIGlzIGV2ZW4gbmVlZGVkLCBhcyBpbiB0aGUgYCFoYXNDYWxsZXJBbmRBcmd1bWVu dHNQcm9wZXJ0aWVzKClgIGNhc2UsCiAgICAgICAgICAgICAvLyB0aGVzZSBwcm9wZXJ0aWVzIGFy ZSBub3QgbGF6eSBhbmQgc2hvdWxkIG5vdCBuZWVkIHRvIGJlIHJlaWZpZWQuIChodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzNTc5KQogICAgICAgICAgICAgYm9vbCBv a2F5ID0gdGhpc09iamVjdC0+aGFzUHJvcGVydHkoZXhlYywgcHJvcGVydHlOYW1lKTsKKyAgICAg ICAgICAgIFJFVFVSTl9JRl9FWENFUFRJT04oc2NvcGUsIGZhbHNlKTsKICAgICAgICAgICAgIEFT U0VSVF9VTlVTRUQob2theSwgb2theSk7CiAgICAgICAgICAgICBzY29wZS5yZWxlYXNlKCk7CiAg ICAgICAgICAgICByZXR1cm4gQmFzZTo6cHV0KHRoaXNPYmplY3QsIGV4ZWMsIHByb3BlcnR5TmFt ZSwgdmFsdWUsIHNsb3QpOwpAQCAtNDk3LDYgKzUwMSw3IEBAIGJvb2wgSlNGdW5jdGlvbjo6ZGVm aW5lT3duUHJvcGVydHkoSlNPYmoKICAgICBKU0Z1bmN0aW9uKiB0aGlzT2JqZWN0ID0ganNDYXN0 PEpTRnVuY3Rpb24qPihvYmplY3QpOwogICAgIGlmICh0aGlzT2JqZWN0LT5pc0hvc3RPckJ1aWx0 aW5GdW5jdGlvbigpKSB7CiAgICAgICAgIHRoaXNPYmplY3QtPnJlaWZ5Qm91bmROYW1lSWZOZWVk ZWQodm0sIGV4ZWMsIHByb3BlcnR5TmFtZSk7CisgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAg ICAgICAgcmV0dXJuIEJhc2U6OmRlZmluZU93blByb3BlcnR5KG9iamVjdCwgZXhlYywgcHJvcGVy dHlOYW1lLCBkZXNjcmlwdG9yLCB0aHJvd0V4Y2VwdGlvbik7CiAgICAgfQogCkBAIC01MDcsNiAr NTEyLDcgQEAgYm9vbCBKU0Z1bmN0aW9uOjpkZWZpbmVPd25Qcm9wZXJ0eShKU09iagogICAgICAg ICB0aGlzT2JqZWN0LT5tZXRob2RUYWJsZSh2bSktPmdldE93blByb3BlcnR5U2xvdCh0aGlzT2Jq ZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWUsIHNsb3QpOwogICAgICAgICBpZiAodGhpc09iamVjdC0+ bV9yYXJlRGF0YSkKICAgICAgICAgICAgIHRoaXNPYmplY3QtPm1fcmFyZURhdGEtPmNsZWFyKCJT dG9yZSB0byBwcm90b3R5cGUgcHJvcGVydHkgb2YgYSBmdW5jdGlvbiIpOworICAgICAgICBzY29w ZS5yZWxlYXNlKCk7CiAgICAgICAgIHJldHVybiBCYXNlOjpkZWZpbmVPd25Qcm9wZXJ0eShvYmpl Y3QsIGV4ZWMsIHByb3BlcnR5TmFtZSwgZGVzY3JpcHRvciwgdGhyb3dFeGNlcHRpb24pOwogICAg IH0KIApAQCAtNTE1LDExICs1MjEsMTMgQEAgYm9vbCBKU0Z1bmN0aW9uOjpkZWZpbmVPd25Qcm9w ZXJ0eShKU09iagogICAgICAgICBpZiAoIXRoaXNPYmplY3QtPmpzRXhlY3V0YWJsZSgpLT5oYXND YWxsZXJBbmRBcmd1bWVudHNQcm9wZXJ0aWVzKCkpIHsKICAgICAgICAgICAgIGlmICh0aGlzT2Jq ZWN0LT5qc0V4ZWN1dGFibGUoKS0+aXNDbGFzcygpKSB7CiAgICAgICAgICAgICAgICAgdGhpc09i amVjdC0+cmVpZnlMYXp5UHJvcGVydHlJZk5lZWRlZCh2bSwgZXhlYywgcHJvcGVydHlOYW1lKTsK KyAgICAgICAgICAgICAgICBzY29wZS5yZWxlYXNlKCk7CiAgICAgICAgICAgICAgICAgcmV0dXJu IEJhc2U6OmRlZmluZU93blByb3BlcnR5KG9iamVjdCwgZXhlYywgcHJvcGVydHlOYW1lLCBkZXNj cmlwdG9yLCB0aHJvd0V4Y2VwdGlvbik7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBQcm9w ZXJ0eVNsb3Qgc2xvdCh0aGlzT2JqZWN0LCBQcm9wZXJ0eVNsb3Q6OkludGVybmFsTWV0aG9kVHlw ZTo6Vk1JbnF1aXJ5KTsKICAgICAgICAgICAgIGlmICghQmFzZTo6Z2V0T3duUHJvcGVydHlTbG90 KHRoaXNPYmplY3QsIGV4ZWMsIHByb3BlcnR5TmFtZSwgc2xvdCkpCiAgICAgICAgICAgICAgICAg dGhpc09iamVjdC0+cHV0RGlyZWN0QWNjZXNzb3IoZXhlYywgcHJvcGVydHlOYW1lLCB0aGlzT2Jq ZWN0LT5nbG9iYWxPYmplY3Qodm0pLT50aHJvd1R5cGVFcnJvckFyZ3VtZW50c0NhbGxlZUFuZENh bGxlckdldHRlclNldHRlcigpLCBEb250RGVsZXRlIHwgRG9udEVudW0gfCBBY2Nlc3Nvcik7Cisg ICAgICAgICAgICBzY29wZS5yZWxlYXNlKCk7CiAgICAgICAgICAgICByZXR1cm4gQmFzZTo6ZGVm aW5lT3duUHJvcGVydHkob2JqZWN0LCBleGVjLCBwcm9wZXJ0eU5hbWUsIGRlc2NyaXB0b3IsIHRo cm93RXhjZXB0aW9uKTsKICAgICAgICAgfQogICAgICAgICB2YWx1ZUNoZWNrID0gIWRlc2NyaXB0 b3IudmFsdWUoKSB8fCBzYW1lVmFsdWUoZXhlYywgZGVzY3JpcHRvci52YWx1ZSgpLCByZXRyaWV2 ZUFyZ3VtZW50cyhleGVjLCB0aGlzT2JqZWN0KSk7CkBAIC01MjcsMTYgKzUzNSwxOSBAQCBib29s IEpTRnVuY3Rpb246OmRlZmluZU93blByb3BlcnR5KEpTT2JqCiAgICAgICAgIGlmICghdGhpc09i amVjdC0+anNFeGVjdXRhYmxlKCktPmhhc0NhbGxlckFuZEFyZ3VtZW50c1Byb3BlcnRpZXMoKSkg ewogICAgICAgICAgICAgaWYgKHRoaXNPYmplY3QtPmpzRXhlY3V0YWJsZSgpLT5pc0NsYXNzKCkp IHsKICAgICAgICAgICAgICAgICB0aGlzT2JqZWN0LT5yZWlmeUxhenlQcm9wZXJ0eUlmTmVlZGVk KHZtLCBleGVjLCBwcm9wZXJ0eU5hbWUpOworICAgICAgICAgICAgICAgIHNjb3BlLnJlbGVhc2Uo KTsKICAgICAgICAgICAgICAgICByZXR1cm4gQmFzZTo6ZGVmaW5lT3duUHJvcGVydHkob2JqZWN0 LCBleGVjLCBwcm9wZXJ0eU5hbWUsIGRlc2NyaXB0b3IsIHRocm93RXhjZXB0aW9uKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIFByb3BlcnR5U2xvdCBzbG90KHRoaXNPYmplY3QsIFByb3Bl cnR5U2xvdDo6SW50ZXJuYWxNZXRob2RUeXBlOjpWTUlucXVpcnkpOwogICAgICAgICAgICAgaWYg KCFCYXNlOjpnZXRPd25Qcm9wZXJ0eVNsb3QodGhpc09iamVjdCwgZXhlYywgcHJvcGVydHlOYW1l LCBzbG90KSkKICAgICAgICAgICAgICAgICB0aGlzT2JqZWN0LT5wdXREaXJlY3RBY2Nlc3Nvcihl eGVjLCBwcm9wZXJ0eU5hbWUsIHRoaXNPYmplY3QtPmdsb2JhbE9iamVjdCh2bSktPnRocm93VHlw ZUVycm9yQXJndW1lbnRzQ2FsbGVlQW5kQ2FsbGVyR2V0dGVyU2V0dGVyKCksIERvbnREZWxldGUg fCBEb250RW51bSB8IEFjY2Vzc29yKTsKKyAgICAgICAgICAgIHNjb3BlLnJlbGVhc2UoKTsKICAg ICAgICAgICAgIHJldHVybiBCYXNlOjpkZWZpbmVPd25Qcm9wZXJ0eShvYmplY3QsIGV4ZWMsIHBy b3BlcnR5TmFtZSwgZGVzY3JpcHRvciwgdGhyb3dFeGNlcHRpb24pOwogICAgICAgICB9CiAgICAg ICAgIHZhbHVlQ2hlY2sgPSAhZGVzY3JpcHRvci52YWx1ZSgpIHx8IHNhbWVWYWx1ZShleGVjLCBk ZXNjcmlwdG9yLnZhbHVlKCksIHJldHJpZXZlQ2FsbGVyRnVuY3Rpb24oZXhlYywgdGhpc09iamVj dCkpOwogICAgIH0gZWxzZSB7CiAgICAgICAgIHRoaXNPYmplY3QtPnJlaWZ5TGF6eVByb3BlcnR5 SWZOZWVkZWQodm0sIGV4ZWMsIHByb3BlcnR5TmFtZSk7CisgICAgICAgIHNjb3BlLnJlbGVhc2Uo KTsKICAgICAgICAgcmV0dXJuIEJhc2U6OmRlZmluZU93blByb3BlcnR5KG9iamVjdCwgZXhlYywg cHJvcGVydHlOYW1lLCBkZXNjcmlwdG9yLCB0aHJvd0V4Y2VwdGlvbik7CiAgICAgfQogICAgICAK