Changeset 33425 in webkit

Timestamp:

May 13, 2008 6:44:59 PM (16 years ago)

Author:

timothy@apple.com

Message:

Fixes a crash when stepping out in the Inspector's debugger.

​http://bugs.webkit.org/show_bug.cgi?id=19037

Reviewed by Dan Bernstein.

• page/InspectorController.cpp:

(WebCore::currentCallFrame): Adds a null check of currentCallFrame,
since it can be null. Also returns JSNull to better signify this.

• page/inspector/ScriptsPanel.js: Updates the debugger interface

when stepping so the currentCallFrame isn't accessed when not paused.
Adds a _clearInterface function to remove duplicate code.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/InspectorController.cpp (modified) (1 diff)
• page/inspector/ScriptsPanel.js (modified) (9 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-05-13  Timothy Hatcher  <timothy@apple.com>
+
+        Fixes a crash when stepping out in the Inspector's debugger.
+
+        http://bugs.webkit.org/show_bug.cgi?id=19037
+
+        Reviewed by Dan Bernstein.
+
+        * page/InspectorController.cpp:
+        (WebCore::currentCallFrame): Adds a null check of currentCallFrame,
+        since it can be null. Also returns JSNull to better signify this.
+        * page/inspector/ScriptsPanel.js: Updates the debugger interface
+        when stepping so the currentCallFrame isn't accessed when not paused.
+        Adds a _clearInterface function to remove duplicate code.
+
 2008-05-13  chris fleizach  <cfleizach@apple.com>
 

trunk/WebCore/page/InspectorController.cpp

@@ -829 +829 @@
 
     JavaScriptCallFrame* callFrame = controller->currentCallFrame();
-    if (!callFrame->isValid())
-        return JSValueMakeUndefined(ctx);
+    if (!callFrame || !callFrame->isValid())
+        return JSValueMakeNull(ctx);
 
     ExecState* globalExec = callFrame->execState()->lexicalGlobalObject()->globalExec();

trunk/WebCore/page/inspector/ScriptsPanel.js

@@ -289 +289 @@
         this.visibleView = null;
 
-        this._clearCurrentExecutionLine();
-
         if (!InspectorController.debuggerAttached()) {
             this._paused = false;
@@ -297 +295 @@
         }
 
-        this.sidebarPanes.callstack.update(null);
-        this.sidebarPanes.scopechain.update(null);
-
-        this._updateDebuggerButtons();
+        this._clearInterface();
 
         this.filesSelectElement.removeChildren();
@@ -565 +560 @@
     },
 
+    _clearInterface: function()
+    {
+        this.sidebarPanes.callstack.update(null);
+        this.sidebarPanes.scopechain.update(null);
+
+        this._clearCurrentExecutionLine();
+        this._updateDebuggerButtons();
+    },
+
     _toggleDebugging: function()
     {
@@ -570 +574 @@
         this._waitingToPause = false;
         this._stepping = false;
+
+        this._clearInterface();
 
         if (InspectorController.debuggerAttached()) {
@@ -578 +584 @@
             InspectorController.startDebuggingAndReloadInspectedPage();
         }
-
-        this.sidebarPanes.callstack.update(null);
-        this.sidebarPanes.scopechain.update(null);
-
-        this._clearCurrentExecutionLine();
-        this._updateDebuggerButtons();
     },
 
@@ -598 +598 @@
         }
 
-        this.sidebarPanes.callstack.update(null);
-        this.sidebarPanes.scopechain.update(null);
-
-        this._clearCurrentExecutionLine();
-        this._updateDebuggerButtons();
+        this._clearInterface();
     },
 
@@ -610 +606 @@
         this._stepping = true;
 
+        this._clearInterface();
+
         InspectorController.stepOverStatementInDebugger();
     },
@@ -618 +616 @@
         this._stepping = true;
 
+        this._clearInterface();
+
         InspectorController.stepIntoStatementInDebugger();
     },
@@ -625 +625 @@
         this._paused = false;
         this._stepping = true;
+
+        this._clearInterface();
 
         InspectorController.stepOutOfFunctionInDebugger();