Changeset 24271 in webkit

Timestamp:

Jul 13, 2007 1:26:38 PM (17 years ago)

Author:

yongjzha

Message:

ligman, reviewed by Yongjun

DESC: stop the recursion in ArgumentListNode's destructor.
​http://bugs.webkit.org/show_bug.cgi?id=14578

• kjs/nodes.cpp: (ArgumentListNode::~ArgumentListNode):
• kjs/nodes.h:

Location:

S60/branches/3.1m/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (1 diff)
• kjs/nodes.h (modified) (1 diff)

S60/branches/3.1m/JavaScriptCore/ChangeLog

@@ +1 @@
+ligman, reviewed by Yongjun
+ DESC:  stop the recursion in ArgumentListNode's destructor. 
+ http://bugs.webkit.org/show_bug.cgi?id=14578
+
+        * kjs/nodes.cpp:
+        (ArgumentListNode::~ArgumentListNode):
+        * kjs/nodes.h:
+
 ligman, reviewed by <reviewer>
  DESC: Character class array is defined to 32. If we don't limit characters to 255 an overflow occurs.

S60/branches/3.1m/JavaScriptCore/kjs/nodes.cpp

@@ -482 +482 @@
 
 // ------------------------------ ArgumentListNode -----------------------------
-
+#ifdef NOKIA_CHANGES
+ArgumentListNode::~ArgumentListNode()
+{
+  // avoid recusive link destruction. 
+  if (list) {
+      // get the next in the list
+      ArgumentListNode* next = list.get();
+      // break the link between this and the next
+      list.setNull();
+      while (next) {
+          ArgumentListNode* curr = next;
+          // get the next
+          next = curr->list.get();          
+          // break the link between curr and next          
+          curr->list.setNull();
+          // deref current...this should destroy it.
+          curr->deref();
+        }
+    }    
+}
+#endif
+    
 Value ArgumentListNode::evaluate(ExecState */*exec*/)
 {

S60/branches/3.1m/JavaScriptCore/kjs/nodes.h

@@ -308 +308 @@
     ArgumentListNode(ArgumentListNode *l, Node *e)
       : list(l->list), expr(e) { l->list = this; }
+#ifdef NOKIA_CHANGES
+    virtual ~ArgumentListNode();      
+#endif
     Value evaluate(ExecState *exec);
     List evaluateList(ExecState *exec);