Changeset 29443 in webkit for trunk/JavaScriptCore

Timestamp:

Jan 12, 2008, 8:52:01 PM (17 years ago)

Author:

[email protected]

Message:

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

Reviewed by Mark Rowe.

Fix ​http://bugs.webkit.org/show_bug.cgi?id=16852
Fixes leaking of ActivationStackNode objects.

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

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/JSGlobalObject.cpp (modified) (4 diffs)
• kjs/JSGlobalObject.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-01-12  Cameron Zwarich  <[email protected]>
+
+        Reviewed by Mark Rowe.
+
+        Fix http://bugs.webkit.org/show_bug.cgi?id=16852
+        Fixes leaking of ActivationStackNode objects.
+
+        * kjs/JSGlobalObject.cpp:
+        (KJS::JSGlobalObject::deleteActivationStack):
+        (KJS::JSGlobalObject::~JSGlobalObject):
+        (KJS::JSGlobalObject::init):
+        (KJS::JSGlobalObject::reset):
+        * kjs/JSGlobalObject.h:
+
 2008-01-12  Darin Adler  <[email protected]>
 

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

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

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -245 +245 @@
         void resetTimeoutCheck();
 
+        void deleteActivationStack();
         void checkActivationCount();