Changeset 141891 in webkit

Timestamp:

Feb 5, 2013 7:05:48 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Web Inspector: prevent crash, add required error string value
​https://bugs.webkit.org/show_bug.cgi?id=108776

Patch by Peter Rybin <​prybin@chromium.org> on 2013-02-05
Reviewed by Pavel Feldman.

Error string is assigned where missing, assert is added where empty string is
possible.

• inspector/InjectedScriptBase.cpp:

(WebCore::InjectedScriptBase::makeEvalCall):

• inspector/PageRuntimeAgent.cpp:

(WebCore::PageRuntimeAgent::injectedScriptForEval):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InjectedScriptBase.cpp (modified) (1 diff)
• inspector/PageRuntimeAgent.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-05  Peter Rybin  <prybin@chromium.org>
+
+        Web Inspector: prevent crash, add required error string value
+        https://bugs.webkit.org/show_bug.cgi?id=108776
+
+        Reviewed by Pavel Feldman.
+
+        Error string is assigned where missing, assert is added where empty string is
+        possible.
+
+        * inspector/InjectedScriptBase.cpp:
+        (WebCore::InjectedScriptBase::makeEvalCall):
+        * inspector/PageRuntimeAgent.cpp:
+        (WebCore::PageRuntimeAgent::injectedScriptForEval):
+
 2013-02-05  Eugene Klyuchnikov  <eustas@chromium.org>
 

trunk/Source/WebCore/inspector/InjectedScriptBase.cpp

@@ -125 +125 @@
     if (result->type() == InspectorValue::TypeString) {
         result->asString(errorString);
+        ASSERT(errorString->length());
         return;
     }

trunk/Source/WebCore/inspector/PageRuntimeAgent.cpp

@@ -136 +136 @@
     if (!executionContextId) {
         ScriptState* scriptState = mainWorldScriptState(m_inspectedPage->mainFrame());
-        return injectedScriptManager()->injectedScriptFor(scriptState);
+        InjectedScript result = injectedScriptManager()->injectedScriptFor(scriptState);
+        if (result.hasNoValue())
+            *errorString = "Internal error: main world execution context not found.";
+        return result;
     }
     InjectedScript injectedScript = injectedScriptManager()->injectedScriptForId(*executionContextId);