Changeset 29435 in webkit for trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

Timestamp:

Jan 12, 2008, 6:06:33 AM (17 years ago)

Author:

[email protected]

Message:

2008-01-12 Cameron Zwarich <​[email protected]>

Reviewed by Mark Rowe.

Fixes leaking of ActivationStackNode objects.

• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::deleteActivationStack): (KJS::JSGlobalObject::~JSGlobalObject): (KJS::JSGlobalObject::init): (KJS::JSGlobalObject::reset):
• kjs/JSGlobalObject.h:

File:

• trunk/JavaScriptCore/kjs/JSGlobalObject.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -91 +91 @@
 JSGlobalObject* JSGlobalObject::s_head = 0;
 
+void JSGlobalObject::deleteActivationStack()
+{
+    for (ActivationStackNode* currentNode = d()->activations; currentNode; currentNode = currentNode->prev)
+        delete currentNode;
+}
+
 JSGlobalObject::~JSGlobalObject()
 {
@@ -103 +109 @@
     if (s_head == this)
         s_head = 0;
+    
+    deleteActivationStack();
     
     delete d();
@@ -128 +136 @@
     d()->recursion = 0;
     d()->debugger = 0;
+    
+    d()->activations = 0;
     
     reset(prototype());
@@ -203 +213 @@
     ExecState* exec = &d()->globalExec;
 
-    d()->activations = new ActivationStackNode;
+    deleteActivationStack();
+    
+    ActivationStackNode* newStackNode = new ActivationStackNode;
+    newStackNode->prev = 0;    
+    d()->activations = newStackNode;
     d()->activationCount = 0;