Changeset 35663 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Aug 11, 2008, 5:01:26 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Mark Rowe.

<rdar://problem/6130393> REGRESSION: PhotoBooth hangs after launching under TOT Webkit

• API/JSContextRef.cpp: (JSGlobalContextRelease): Corrected a comment.

• kjs/collector.cpp: (KJS::Heap::~Heap): Ensure that JSGlobalData is not deleted while sweeping the heap.

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -135 +135 @@
 Heap::~Heap()
 {
+    // The global object is not GC protected at this point, so sweeping may delete it (and thus the global data)
+    // before other objects that may use the global data.
+    RefPtr<JSGlobalData> protect(m_globalData);
+
     delete m_markListSet;
+    m_markListSet = 0;
+
     sweep<PrimaryHeap>();
     // No need to sweep number heap, because the JSNumber destructor doesn't do anything.