Changeset 5645 in webkit for trunk/JavaScriptCore/kjs/object.cpp

Timestamp:

Dec 2, 2003, 2:11:47 AM (21 years ago)

Author:

mjs

Message:

Merged patches from Harri Porten and David Faure to fix:

<rdar://problem/3497643>: reproducible crash printing self-referential array

• kjs/array_object.cpp: (ArrayProtoFuncImp::call): Break out of the loop if an exception was thrown.
• kjs/nodes.cpp: (FunctionCallNode::evaluate): Move function call depth check from here...
• kjs/object.cpp: (KJS::Object::call): ...to here.
• kjs/object.h: Un-inline Object::call now that it does more.

File:

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

trunk/JavaScriptCore/kjs/object.cpp

@@ -52 +52 @@
 }
 
+
+Value Object::call(ExecState *exec, Object &thisObj, const List &args)
+{ 
+#if KJS_MAX_STACK > 0
+  static int depth = 0; // sum of all concurrent interpreters
+  if (++depth > KJS_MAX_STACK) {
+    --depth;
+    Object err = Error::create(exec, RangeError,
+                               "Maximum call stack size exceeded.");
+    exec->setException(err);
+    return err;
+  }
+#endif
+
+  Value ret = imp()->call(exec,thisObj,args); 
+
+#if KJS_MAX_STACK > 0
+  --depth;
+#endif
+
+  return ret;
+}
+
 // ------------------------------ ObjectImp ------------------------------------