Changeset 34092 in webkit for trunk/JavaScriptCore

Timestamp:

May 23, 2008, 4:07:19 PM (17 years ago)

Author:

[email protected]

Message:

2008-05-23 Kevin McCullough <​[email protected]>

Reviewed by Sam.

<rdar://problem/5960012> JSProfiler: Stack overflow if recursion is
too deep.
-Use a simple depth limit to restrict too deep of recursion.

• profiler/Profile.cpp: (KJS::Profile::willExecute): (KJS::Profile::didExecute):
• profiler/Profile.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• profiler/Profile.cpp (modified) (3 diffs)
• profiler/Profile.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-23  Kevin McCullough  <[email protected]>
+
+        Reviewed by Sam.
+
+        <rdar://problem/5960012> JSProfiler: Stack overflow if recursion is
+        too deep.
+        -Use a simple depth limit to restrict too deep of recursion.
+
+        * profiler/Profile.cpp:
+        (KJS::Profile::willExecute):
+        (KJS::Profile::didExecute):
+        * profiler/Profile.h:
+
 2008-05-23  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/profiler/Profile.cpp

@@ -36 +36 @@
 namespace KJS {
 
+const unsigned DEPTH_LIMIT = 1000;
+
 Profile::Profile(const UString& title, ExecState* originatingGlobalExec, unsigned pageGroupIdentifier)
     : m_title(title)
     , m_originatingGlobalExec(originatingGlobalExec)
     , m_pageGroupIdentifier(pageGroupIdentifier)
+    , m_depth(0)
 {
     // FIXME: When multi-threading is supported this will be a vector and calls
@@ -52 +55 @@
     m_originatingGlobalExec = 0;
     m_headNode->stopProfiling();
+    m_depth = 0;
 }
 
 void Profile::willExecute(const CallIdentifier& callIdentifier)
 {
+    if (++m_depth >= DEPTH_LIMIT)
+        return;
+        
     ASSERT(m_currentNode);
     m_currentNode = m_currentNode->willExecute(callIdentifier);
@@ -77 +84 @@
 
     m_currentNode = m_currentNode->didExecute();
+    --m_depth;
 }
 

trunk/JavaScriptCore/profiler/Profile.h

@@ -79 +79 @@
         RefPtr<ProfileNode> m_headNode;
         RefPtr<ProfileNode> m_currentNode;
+        
+        unsigned m_depth;
     };