Changeset 93042 in webkit

Timestamp:

Aug 15, 2011 7:32:41 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: [V8] crash upon stepIn while not on pause.
​https://bugs.webkit.org/show_bug.cgi?id=66221

Reviewed by Yury Semikhatsky.

• inspector/InspectorDebuggerAgent.cpp:

(WebCore::InspectorDebuggerAgent::resume):
(WebCore::InspectorDebuggerAgent::stepOver):
(WebCore::InspectorDebuggerAgent::stepInto):
(WebCore::InspectorDebuggerAgent::stepOut):
(WebCore::InspectorDebuggerAgent::assertPaused):

• inspector/InspectorDebuggerAgent.h:
• inspector/front-end/ScriptsPanel.js:

(WebInspector.ScriptsPanel.prototype._stepOverClicked):
(WebInspector.ScriptsPanel.prototype._stepIntoClicked):
(WebInspector.ScriptsPanel.prototype._stepOutClicked):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• inspector/InspectorDebuggerAgent.cpp (modified) (2 diffs)
• inspector/InspectorDebuggerAgent.h (modified) (1 diff)
• inspector/front-end/ScriptsPanel.js (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-15  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: [V8] crash upon stepIn while not on pause.
+        https://bugs.webkit.org/show_bug.cgi?id=66221
+
+        Reviewed by Yury Semikhatsky.
+
+        * inspector/InspectorDebuggerAgent.cpp:
+        (WebCore::InspectorDebuggerAgent::resume):
+        (WebCore::InspectorDebuggerAgent::stepOver):
+        (WebCore::InspectorDebuggerAgent::stepInto):
+        (WebCore::InspectorDebuggerAgent::stepOut):
+        (WebCore::InspectorDebuggerAgent::assertPaused):
+        * inspector/InspectorDebuggerAgent.h:
+        * inspector/front-end/ScriptsPanel.js:
+        (WebInspector.ScriptsPanel.prototype._stepOverClicked):
+        (WebInspector.ScriptsPanel.prototype._stepIntoClicked):
+        (WebInspector.ScriptsPanel.prototype._stepOutClicked):
+
 2011-08-15  Vsevolod Vlasov  <vsevik@chromium.org>
 

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.cpp

@@ -357 +357 @@
 }
 
-void InspectorDebuggerAgent::resume(ErrorString*)
-{
+void InspectorDebuggerAgent::resume(ErrorString* errorString)
+{
+    if (!assertPaused(errorString))
+        return;
     m_injectedScriptManager->releaseObjectGroup(InspectorDebuggerAgent::backtraceObjectGroup);
     scriptDebugServer().continueProgram();
 }
 
-void InspectorDebuggerAgent::stepOver(ErrorString*)
-{
+void InspectorDebuggerAgent::stepOver(ErrorString* errorString)
+{
+    if (!assertPaused(errorString))
+        return;
     scriptDebugServer().stepOverStatement();
 }
 
-void InspectorDebuggerAgent::stepInto(ErrorString*)
-{
+void InspectorDebuggerAgent::stepInto(ErrorString* errorString)
+{
+    if (!assertPaused(errorString))
+        return;
     scriptDebugServer().stepIntoStatement();
 }
 
-void InspectorDebuggerAgent::stepOut(ErrorString*)
-{
+void InspectorDebuggerAgent::stepOut(ErrorString* errorString)
+{
+    if (!assertPaused(errorString))
+        return;
     scriptDebugServer().stepOutOfFunction();
 }
@@ -506 +514 @@
 }
 
+bool InspectorDebuggerAgent::assertPaused(ErrorString* errorString)
+{
+    if (!m_pausedScriptState) {
+        *errorString = "Can only perform operation while paused.";
+        return false;
+    }
+    return true;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/inspector/InspectorDebuggerAgent.h

@@ -137 +137 @@
     PassRefPtr<InspectorObject> resolveBreakpoint(const String& breakpointId, const String& scriptId, const ScriptBreakpoint&);
     void clear();
+    bool assertPaused(ErrorString*);
 
     typedef HashMap<String, Script> ScriptsMap;

trunk/Source/WebCore/inspector/front-end/ScriptsPanel.js

@@ -951 +951 @@
     _stepOverClicked: function()
     {
+        if (!this._paused)
+            return;
+
         this._paused = false;
         this._stepping = true;
@@ -961 +964 @@
     _stepIntoClicked: function()
     {
+        if (!this._paused)
+            return;
+
         this._paused = false;
         this._stepping = true;
@@ -971 +977 @@
     _stepOutClicked: function()
     {
+        if (!this._paused)
+            return;
+
         this._paused = false;
         this._stepping = true;