Changeset 34304 in webkit for trunk/JavaScriptCore/kjs/array_object.cpp

Timestamp:

Jun 2, 2008, 9:36:01 AM (17 years ago)

Author:

[email protected]

Message:

2008-06-02 Geoffrey Garen <​[email protected]>

Reviewed by Adele Peterson.

Added a specific affordance for avoiding stack overflow when converting
recursive arrays to string, in preparation for removing generic stack
overflow checking from JSObject::call.

Tested by fast/js/toString-stack-overflow.html.

File:

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

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -93 +93 @@
         return throwError(exec, TypeError);
 
-    bool alreadyVisited = !exec->dynamicGlobalObject()->arrayVisitedElements().add(thisObj).second;
+    HashSet<JSObject*>& arrayVisitedElements = exec->dynamicGlobalObject()->arrayVisitedElements();
+    if (arrayVisitedElements.size() > MaxReentryDepth)
+        return throwError(exec, RangeError, "Maximum call stack size exceeded.");
+
+    bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
     Vector<UChar, 256> strBuffer;
     if (alreadyVisited)
@@ -132 +136 @@
         return throwError(exec, TypeError);
 
-    bool alreadyVisited = !exec->dynamicGlobalObject()->arrayVisitedElements().add(thisObj).second;
+    HashSet<JSObject*>& arrayVisitedElements = exec->dynamicGlobalObject()->arrayVisitedElements();
+    if (arrayVisitedElements.size() > MaxReentryDepth)
+        return throwError(exec, RangeError, "Maximum call stack size exceeded.");
+
+    bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
     Vector<UChar, 256> strBuffer;
     if (alreadyVisited)
@@ -174 +182 @@
 JSValue* arrayProtoFuncJoin(ExecState* exec, JSObject* thisObj, const List& args)
 {
-    bool alreadyVisited = !exec->dynamicGlobalObject()->arrayVisitedElements().add(thisObj).second;
+    HashSet<JSObject*>& arrayVisitedElements = exec->dynamicGlobalObject()->arrayVisitedElements();
+    if (arrayVisitedElements.size() > MaxReentryDepth)
+        return throwError(exec, RangeError, "Maximum call stack size exceeded.");
+
+    bool alreadyVisited = !arrayVisitedElements.add(thisObj).second;
     Vector<UChar, 256> strBuffer;
     if (alreadyVisited)