165986 2016-12-16 20:01:26 -0800 JSContext Inspector: Avoid some possible exceptions inspecting a JSContext 2016-12-16 21:05:59 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam oldest_to_newest 1260874 0 joepeck 2016-12-16 20:01:26 -0800 Summary: Avoid some possible exceptions inspecting a JSContext Steps to Reproduce: 1. Inspect a JSContext application => Some exceptions happen 2. Log some objects => Some possible exceptions 1260875 1 joepeck 2016-12-16 20:02:00 -0800 <rdar://problem/29551379> 1260878 2 297389 joepeck 2016-12-16 20:05:38 -0800 Created attachment 297389 [PATCH] Proposed Fix 1260883 3 297389 mattbaker 2016-12-16 20:41:44 -0800 Comment on attachment 297389 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=297389&action=review r=me > Source/JavaScriptCore/inspector/InjectedScriptSource.js:-65 > - Sweet! 1260884 4 297389 commit-queue 2016-12-16 21:05:55 -0800 Comment on attachment 297389 [PATCH] Proposed Fix Clearing flags on attachment: 297389 Committed r209958: <http://trac.webkit.org/changeset/209958> 1260885 5 commit-queue 2016-12-16 21:05:59 -0800 All reviewed patches have been landed. Closing bug. 297389 2016-12-16 20:05:38 -0800 2016-12-16 21:05:55 -0800 [PATCH] Proposed Fix jscontext-1.patch text/plain 5146 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IGM4OWZiYmEuLjNiZGYwN2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE2LTEyLTE2ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgSlNDb250ZXh0IEluc3BlY3Rvcjog QXZvaWQgc29tZSBwb3NzaWJsZSBleGNlcHRpb25zIGluc3BlY3RpbmcgYSBKU0NvbnRleHQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2NTk4NgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMjk1NTEzNzk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2Uu anM6CisgICAgICAgIChJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUucHJvY2Vzc1Byb3BlcnRpZXMp OgorICAgICAgICBQcmVmZXIgU3RyaW5nLnByb3RvdHlwZS5lbmRzV2l0aCBub3cgdGhhdCBpdCBp cyBhdmFpbGFibGUuCisKKyAgICAgICAgKEluamVjdGVkU2NyaXB0LnByb3RvdHlwZS5fZGVzY3Jp YmUpOgorICAgICAgICBQcmVmZXIgRnVuY3Rpb24ucHJvdG90eXBlLnRvU3RyaW5nIGZvciBjb252 ZXJ0aW5nIGZ1bmN0aW9ucyB0byBTdHJpbmcuCisgICAgICAgIFByZXZpb3VzbHkgd2Ugd2VyZSBk b2luZyBTdHJpbmcoZikgd2hpY2ggd291bGQgdG8gU3ltYm9sLnRvUHJpbWl0aXZlCisgICAgICAg IGNvbnZlcnNpb24gd2hpY2ggc2VlbXMgdW5uZWNlc3NhcnkgaGVyZS4KKwogMjAxNi0xMi0xNiAg TWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgQWRkIHByZWRlY2Vzc29y IGluZm8gdG8gZHVtcHMgZnJvbSBKU0NfZHVtcEJ5dGVjb2RlTGl2ZW5lc3NSZXN1bHRzPXRydWUu CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2Ny aXB0U291cmNlLmpzIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNj cmlwdFNvdXJjZS5qcwppbmRleCA0NDQ5MGRlLi5jOWE1MTVmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0U291cmNlLmpzCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRTb3VyY2UuanMKQEAg LTU1LDE0ICs1NSw2IEBAIGZ1bmN0aW9uIGlzVUludDMyKG9iaikKICAgICByZXR1cm4gIiIgKyAo b2JqID4+PiAwKSA9PT0gb2JqOwogfQogCi1mdW5jdGlvbiBlbmRzV2l0aChzdHIsIHN1ZmZpeCkK LXsKLSAgICB2YXIgcG9zaXRpb24gPSBzdHIubGVuZ3RoIC0gc3VmZml4Lmxlbmd0aDsKLSAgICBp ZiAocG9zaXRpb24gPCAwKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgcmV0dXJuIHN0ci5p bmRleE9mKHN1ZmZpeCwgcG9zaXRpb24pID09PSBwb3NpdGlvbjsKLX0KLQogZnVuY3Rpb24gaXNT eW1ib2wob2JqKQogewogICAgIHJldHVybiB0eXBlb2Ygb2JqID09PSAic3ltYm9sIjsKQEAgLTY1 Myw3ICs2NDUsNyBAQCBJbmplY3RlZFNjcmlwdC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgfQogCiAgICAgICAgICAgICAgICAgaWYgKG5hdGl2ZUdldHRlcnNBc1ZhbHVlcykgewotICAg ICAgICAgICAgICAgICAgICBpZiAoZW5kc1dpdGgoU3RyaW5nKGRlc2NyaXB0b3IuZ2V0KSwgIltu YXRpdmUgY29kZV1cbn0iKSB8fCAoIWRlc2NyaXB0b3IuZ2V0ICYmIGRlc2NyaXB0b3IuaGFzT3du UHJvcGVydHkoImdldCIpICYmICFkZXNjcmlwdG9yLnNldCAmJiBkZXNjcmlwdG9yLmhhc093blBy b3BlcnR5KCJzZXQiKSkpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKFN0cmluZyhkZXNjcmlw dG9yLmdldCkuZW5kc1dpdGgoIltuYXRpdmUgY29kZV1cbn0iKSB8fCAoIWRlc2NyaXB0b3IuZ2V0 ICYmIGRlc2NyaXB0b3IuaGFzT3duUHJvcGVydHkoImdldCIpICYmICFkZXNjcmlwdG9yLnNldCAm JiBkZXNjcmlwdG9yLmhhc093blByb3BlcnR5KCJzZXQiKSkpIHsKICAgICAgICAgICAgICAgICAg ICAgICAgIC8vIERldmVsb3BlcnMgbWF5IGNyZWF0ZSBzdWNoIGEgZGVzY3JpcHRvciwgc28gd2Ug c2hvdWxkIGJlIHJlc2lsaWVudDoKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIHZhciB4ID0g e307IE9iamVjdC5kZWZpbmVQcm9wZXJ0eSh4LCAicCIsIHtnZXQ6dW5kZWZpbmVkfSk7IE9iamVj dC5nZXRPd25Qcm9wZXJ0eURlc2NyaXB0b3IoeCwgInAiKQogICAgICAgICAgICAgICAgICAgICAg ICAgdmFyIGZha2VEZXNjcmlwdG9yID0gY3JlYXRlRmFrZVZhbHVlRGVzY3JpcHRvcihuYW1lLCBz eW1ib2wsIGRlc2NyaXB0b3IsIGlzT3duUHJvcGVydHksIHRydWUpOwpAQCAtODE1LDcgKzgwNyw3 IEBAIEluamVjdGVkU2NyaXB0LnByb3RvdHlwZSA9IHsKIAogICAgICAgICAvLyBOb2RlTGlzdCBp biBKU0MgaXMgYSBmdW5jdGlvbiwgY2hlY2sgZm9yIGFycmF5IHByaW9yIHRvIHRoaXMuCiAgICAg ICAgIGlmICh0eXBlb2Ygb2JqID09PSAiZnVuY3Rpb24iKQotICAgICAgICAgICAgcmV0dXJuIHRv U3RyaW5nKG9iaik7CisgICAgICAgICAgICByZXR1cm4gb2JqLnRvU3RyaW5nKCk7CiAKICAgICAg ICAgLy8gSWYgT2JqZWN0LCB0cnkgZm9yIGEgYmV0dGVyIG5hbWUgZnJvbSB0aGUgY29uc3RydWN0 b3IuCiAgICAgICAgIGlmIChjbGFzc05hbWUgPT09ICJPYmplY3QiKSB7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0No YW5nZUxvZwppbmRleCAwNjAwZDRiLi4zNmVmYjczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyMCBAQAorMjAxNi0xMi0xNiAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9A YXBwbGUuY29tPgorCisgICAgICAgIEpTQ29udGV4dCBJbnNwZWN0b3I6IEF2b2lkIHNvbWUgcG9z c2libGUgZXhjZXB0aW9ucyBpbnNwZWN0aW5nIGEgSlNDb250ZXh0CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjU5ODYKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzI5NTUxMzc5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIFRoZXJlIHdp bGwgbm90IGJlIGEgbWFpbiBmcmFtZSBpZiB3ZSBhcmUgZGVidWdnaW5nIGEgSlNDb250ZXh0Lgor ICAgICAgICBJbiB0aG9zZSBjYXNlcyBkbyBub3QgY2hhbmdlIHRoZSB0aXRsZS4KKworICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VTaWRlYmFyUGFuZWwuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwucHJvdG90eXBlLl9zY3JpcHRXYXNB ZGRlZCk6CisgICAgICAgIFRoZXJlIG1heSBub3QgYmUgYSBwYXJlbnQgZm9sZGVyIGluIEphdmFT Y3JpcHQgaW5zcGVjdGlvbi4gSW4gdGhhdCBjYXNlCisgICAgICAgIFNjcmlwdFRyZWVFbGVtZW50 cyBhcmUgYWRkZWQgdG8gdGhlIFRvcCBMZXZlbCwgbm90IGZvbGRlcnMuCisKIDIwMTYtMTItMTYg IE1hdHQgQmFrZXIgIDxtYXR0YmFrZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0 b3I6IE1vZGVybml6ZSBmaW5kIGJhbm5lciBVSQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDc0YTgzMDcuLjRlNGYwNGIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAg LTY5Miw3ICs2OTIsOCBAQCBXZWJJbnNwZWN0b3IuY29udGVudEJyb3dzZXJUcmVlRWxlbWVudEZv clJlcHJlc2VudGVkT2JqZWN0ID0gZnVuY3Rpb24oY29udGVudEJybwogV2ViSW5zcGVjdG9yLnVw ZGF0ZVdpbmRvd1RpdGxlID0gZnVuY3Rpb24oKQogewogICAgIHZhciBtYWluRnJhbWUgPSB0aGlz LmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZTsKLSAgICBjb25zb2xlLmFzc2VydChtYWlu RnJhbWUpOworICAgIGlmICghbWFpbkZyYW1lKQorICAgICAgICByZXR1cm47CiAKICAgICB2YXIg dXJsQ29tcG9uZW50cyA9IG1haW5GcmFtZS5tYWluUmVzb3VyY2UudXJsQ29tcG9uZW50czsKIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwppbmRleCBiNmMzOTAwLi5mNGNiMzYxIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNv dXJjZVNpZGViYXJQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5lbC5qcwpAQCAtMzIwLDcgKzMyMCw4IEBAIFdl Ykluc3BlY3Rvci5SZXNvdXJjZVNpZGViYXJQYW5lbCA9IGNsYXNzIFJlc291cmNlU2lkZWJhclBh bmVsIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgICAgICB9CiAgICAgICAgIH0KIAotICAgICAg ICBwYXJlbnRGb2xkZXJUcmVlRWxlbWVudC5yZXByZXNlbnRlZE9iamVjdC5hZGQoc2NyaXB0KTsK KyAgICAgICAgaWYgKHBhcmVudEZvbGRlclRyZWVFbGVtZW50KQorICAgICAgICAgICAgcGFyZW50 Rm9sZGVyVHJlZUVsZW1lbnQucmVwcmVzZW50ZWRPYmplY3QuYWRkKHNjcmlwdCk7CiAKICAgICAg ICAgdmFyIHNjcmlwdFRyZWVFbGVtZW50ID0gbmV3IFdlYkluc3BlY3Rvci5TY3JpcHRUcmVlRWxl bWVudChzY3JpcHQpOwogCg==