Changeset 34664 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 19, 2008, 2:13:41 PM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Sam.

Fix an assertion failure at startup.

• kjs/JSObject.h: (KJS::JSObject::JSObject): Allow jsNull prototype in an assertion (I had it fixed in a wrong copy of the file, so I wasn't getting the failure).

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSObject.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-19  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Sam.
+
+        Fix an assertion failure at startup.
+
+        * kjs/JSObject.h: (KJS::JSObject::JSObject): Allow jsNull prototype in an assertion (I had
+        it fixed in a wrong copy of the file, so I wasn't getting the failure).
+
 2008-06-19  Alexey Proskuryakov  <[email protected]>
 

trunk/JavaScriptCore/kjs/JSObject.h

@@ -487 +487 @@
 {
     ASSERT(proto);
-    ASSERT(Heap::heap(this) == Heap::heap(proto));
+    ASSERT(proto == jsNull() || Heap::heap(this) == Heap::heap(proto));
 }