Changeset 2735 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Nov 18, 2002, 1:45:10 PM (23 years ago)

Author:

mjs

Message:

Change ArgumentListNode operations to be iterative instead of
recursive. This probably fixes 3095446 (Crash in
KJS::ArgumentListNode::ref()) but I can't reproduce it myself so
I'm not 100% sure. I think the original bug was a stack overflow
and this change would remove that possibility.

• kjs/nodes.cpp: (ArgumentListNode::ref): Make iterative. (ArgumentListNode::deref): Make iterative. (ArgumentListNode::evaluateList): Make iterative.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -551 +551 @@
 void ArgumentListNode::ref()
 {
-  Node::ref();
-  if ( expr )
-    expr->ref();
-  if ( list )
-    list->ref();
+  ArgumentListNode *l = this;
+
+  while (l != NULL) {
+    l->Node::ref();
+    if ( l->expr )
+      l->expr->ref();
+    l = l->list;
+  }
 }
 
@@ -562 +565 @@
   if ( expr && expr->deref() )
     delete expr;
-  if ( list && list->deref() )
-    delete list;
+
+  ArgumentListNode *l = this->list;
+
+  while (l != NULL) {
+    if ( l->expr && l->expr->deref() )
+      delete l->expr;
+    
+    ArgumentListNode *next = l->list;
+
+    if (l->Node::deref()) {
+      l->list = NULL;
+      delete l;
+    }
+
+    l = next;
+  }
+
   return Node::deref();
 }
@@ -577 +595 @@
 {
   List l;
-  if (list) {
-    l = list->evaluateList(exec);
+
+  ArgumentListNode *n = this;
+
+  while (n != NULL) {
+    Value v = n->expr->evaluate(exec);
     KJS_CHECKEXCEPTIONLIST
-  }
-
-  Value v = expr->evaluate(exec);
-  KJS_CHECKEXCEPTIONLIST
-
-  l.append(v);
+
+    l.append(v);
+
+    n = n->list;
+  }
 
   return l;