Changeset 189295 in webkit

Timestamp:

Sep 3, 2015 3:28:55 PM (9 years ago)

Author:

BJ Burg

Message:

Web Inspector: should crash on purpose if InjectedScriptSource.js is unparseable
​https://bugs.webkit.org/show_bug.cgi?id=148750

Reviewed by Timothy Hatcher.

If an injected script cannot be parsed or executed without exception, we should abort as
soon as possible. This patch adds a release assertion after creating the injected
script and dumps the bad injected script's source as it was embedded into the binary.

• inspector/InjectedScriptManager.cpp:

(Inspector::InjectedScriptManager::injectedScriptFor):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptManager.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-09-03  Brian Burg  <bburg@apple.com>
+
+        Web Inspector: should crash on purpose if InjectedScriptSource.js is unparseable
+        https://bugs.webkit.org/show_bug.cgi?id=148750
+
+        Reviewed by Timothy Hatcher.
+
+        If an injected script cannot be parsed or executed without exception, we should abort as
+        soon as possible. This patch adds a release assertion after creating the injected
+        script and dumps the bad injected script's source as it was embedded into the binary.
+
+        * inspector/InjectedScriptManager.cpp:
+        (Inspector::InjectedScriptManager::injectedScriptFor):
+
 2015-09-03  Basile Clement  <basile_clement@apple.com> and Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/inspector/InjectedScriptManager.cpp

@@ -178 +178 @@
     int id = injectedScriptIdFor(inspectedExecState);
     Deprecated::ScriptObject injectedScriptObject = createInjectedScript(injectedScriptSource(), inspectedExecState, id);
+    if (injectedScriptObject.scriptState() != inspectedExecState) {
+        WTFLogAlways("Failed to parse/execute InjectedScriptSource.js!");
+        WTFLogAlways("%s\n", injectedScriptSource().ascii().data());
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+
     InjectedScript result(injectedScriptObject, &m_environment);
     m_idToInjectedScript.set(id, result);