Changeset 34024 in webkit for trunk/JavaScriptCore

Timestamp:

May 22, 2008, 2:53:25 AM (17 years ago)

Author:

[email protected]

Message:

Roll out r34020 as it causes recursion tests to fail.

RS=Maciej

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/object.cpp (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-22  Oliver Hunt  <[email protected]>
+
+        RS=Maciej.
+
+        Roll out r34020 as it causes recursion tests to fail.
+
+        * kjs/object.cpp:
+        (KJS::JSObject::call):
+
 2008-05-22  Oliver Hunt  <[email protected]>
 

trunk/JavaScriptCore/kjs/object.cpp

@@ -35 +35 @@
 #include <wtf/Assertions.h>
 
+// maximum global call stack size. Protects against accidental or
+// malicious infinite recursions. Define to -1 if you want no limit.
+// In real-world testing it appears ok to bump the stack depth count to 500.
+// This of course is dependent on stack frame size.
+#define KJS_MAX_STACK 500
+
+#define JAVASCRIPT_CALL_TRACING 0
 #define JAVASCRIPT_MARK_TRACING 0
 
+#if JAVASCRIPT_CALL_TRACING
+static bool _traceJavaScript = false;
+
+extern "C" {
+    void setTraceJavaScript(bool f)
+    {
+        _traceJavaScript = f;
+    }
+
+    static bool traceJavaScript()
+    {
+        return _traceJavaScript;
+    }
+}
+#endif
+
 namespace KJS {
 
@@ -44 +67 @@
 {
   ASSERT(implementsCall());
+
+#if KJS_MAX_STACK > 0
+  static int depth = 0; // sum of all extant function calls
+
+#if JAVASCRIPT_CALL_TRACING
+    static bool tracing = false;
+    if (traceJavaScript() && !tracing) {
+        tracing = true;
+        for (int i = 0; i < depth; i++)
+            putchar (' ');
+        printf ("*** calling:  %s\n", toString(exec).ascii());
+        for (int j = 0; j < args.size(); j++) {
+            for (int i = 0; i < depth; i++)
+                putchar (' ');
+            printf ("*** arg[%d] = %s\n", j, args[j]->toString(exec).ascii());
+        }
+        tracing = false;
+    }
+#endif
+
+  if (++depth > KJS_MAX_STACK) {
+    --depth;
+    return throwError(exec, RangeError, "Maximum call stack size exceeded.");
+  }
+#endif
 
 #if JAVASCRIPT_PROFILING
@@ -53 +101 @@
 #if JAVASCRIPT_PROFILING
     Profiler::profiler()->didExecute(exec, this);
+#endif
+
+
+#if KJS_MAX_STACK > 0
+  --depth;
+#endif
+
+#if JAVASCRIPT_CALL_TRACING
+    if (traceJavaScript() && !tracing) {
+        tracing = true;
+        for (int i = 0; i < depth; i++)
+            putchar (' ');
+        printf ("*** returning:  %s\n", ret->toString(exec).ascii());
+        tracing = false;
+    }
 #endif