Changeset 37646 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 16, 2008, 8:05:58 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-16 Maciej Stachowiak <​[email protected]>

Reviewed by Oliver Hunt.

• fix for REGRESSION: r37631 causing crashes on buildbot ​https://bugs.webkit.org/show_bug.cgi?id=21682

• kjs/collector.cpp: (JSC::Heap::collect): Avoid crashing when a GC occurs while no global objects are live.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-16  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Oliver Hunt.
+
+        - fix for REGRESSION: r37631 causing crashes on buildbot
+        https://bugs.webkit.org/show_bug.cgi?id=21682
+        
+        * kjs/collector.cpp:
+        (JSC::Heap::collect): Avoid crashing when a GC occurs while no global objects are live.
+
 2008-10-16  Sam Weinig  <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -971 +971 @@
 
     JSGlobalObject* globalObject = m_globalData->head;
-    do {
-        globalObject->markCrossHeapDependentObjects();
-        globalObject = globalObject->next();
-    } while (globalObject != m_globalData->head);
+    if (globalObject) {
+        do {
+            globalObject->markCrossHeapDependentObjects();
+            globalObject = globalObject->next();
+        } while (globalObject != m_globalData->head);
+    }
 
     JAVASCRIPTCORE_GC_MARKED();