Changeset 31743 in webkit

Timestamp:

Apr 8, 2008 5:06:12 PM (16 years ago)

Author:

timothy@apple.com

Message:

Fixes a crash in KJS::JSValue::toObject when closing
Safari with Inspector open.

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

Reviewed by Adam Roben.

• page/InspectorController.cpp:

(WebCore::inspectedWindow): NULL check the result of toJSDOMWindow.
Return JSNull if JSDOMWindow is 0.

• page/inspector/ElementsPanel.js:

(ElementsPanel.prototype.reset): NULL check the result of
InspectorController.inspectedWindow.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/InspectorController.cpp (modified) (1 diff)
• page/inspector/ElementsPanel.js (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-04-08  Timothy Hatcher  <timothy@apple.com>
+
+        Fixes a crash in KJS::JSValue::toObject when closing
+        Safari with Inspector open.
+
+        http://bugs.webkit.org/show_bug.cgi?id=18371
+
+        Reviewed by Adam Roben.
+
+        * page/InspectorController.cpp:
+        (WebCore::inspectedWindow): NULL check the result of toJSDOMWindow.
+        Return JSNull if JSDOMWindow is 0.
+        * page/inspector/ElementsPanel.js:
+        (ElementsPanel.prototype.reset): NULL check the result of
+        InspectorController.inspectedWindow.
+
 2008-04-08  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/page/InspectorController.cpp

@@ -622 +622 @@
         return JSValueMakeUndefined(ctx);
 
-    return toRef(toJSDOMWindow(controller->inspectedPage()->mainFrame()));
+    JSDOMWindow* window = toJSDOMWindow(controller->inspectedPage()->mainFrame());
+    if (!window)
+        return JSValueMakeNull(ctx);
+
+    return toRef(window);
 }
 

trunk/WebCore/page/inspector/ElementsPanel.js

@@ -127 +127 @@
     reset: function()
     {
-        var inspectedRootDocument = InspectorController.inspectedWindow().document;
+        var inspectedWindow = InspectorController.inspectedWindow();
+        if (!inspectedWindow) {
+            this.rootDOMNode = null;
+            this.focusedDOMNode = null;
+            return;
+        }
+
+        var inspectedRootDocument = inspectedWindow.document;
         this.rootDOMNode = inspectedRootDocument;