Changeset 29335 in webkit

Timestamp:

Jan 8, 2008 8:49:23 PM (16 years ago)

Author:

timothy@apple.com

Message:

Reviewed by Brady.

Bug 16678: Unreproducible crash in KJS::JSObject::inherits() after using Web Inspector
​http://bugs.webkit.org/show_bug.cgi?id=16678

Add a NULL check for controller before calling JSObjectSetPrivate.

• page/InspectorController.cpp: (WebCore::InspectorController::~InspectorController):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-01-08  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Brady.
+
+        Bug 16678: Unreproducible crash in KJS::JSObject::inherits() after using Web Inspector
+        http://bugs.webkit.org/show_bug.cgi?id=16678
+
+        Add a NULL check for controller before calling JSObjectSetPrivate.
+
+        * page/InspectorController.cpp:
+        (WebCore::InspectorController::~InspectorController):
+
 2008-01-08  Xan Lopez  <xan@gnome.org>
 

trunk/WebCore/page/InspectorController.cpp

@@ -595 +595 @@
         JSRetainPtr<JSStringRef> controllerProperty(Adopt, JSStringCreateWithUTF8CString("InspectorController"));
         JSObjectRef controller = JSValueToObject(m_scriptContext, JSObjectGetProperty(m_scriptContext, global, controllerProperty.get(), 0), 0);
-        JSObjectSetPrivate(controller, 0);
+        if (controller)
+            JSObjectSetPrivate(controller, 0);
     }