Changeset 10354 in webkit for trunk/JavaScriptCore

Timestamp:

Aug 26, 2005, 4:46:27 PM (20 years ago)

Author:

mjs

Message:

Reviewed by John.

<rdar://problem/4224911> many many leaks in kjsyyparse with malformed Javascript

Record all nodes that are created during parsing, and delete any
that are left floating with a refcount of 0.

• kjs/internal.cpp: (KJS::Parser::saveNewNode): (KJS::clearNewNodes): (KJS::Parser::parse):
• kjs/internal.h:
• kjs/nodes.cpp: (Node::Node):
• kjs/nodes.h: (KJS::Node::refcount):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/internal.cpp (modified) (3 diffs)
• kjs/internal.h (modified) (2 diffs)
• kjs/nodes.cpp (modified) (1 diff)
• kjs/nodes.h (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-08-26  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by John.
+
+        <rdar://problem/4224911> many many leaks in kjsyyparse with malformed Javascript        
+
+        Record all nodes that are created during parsing, and delete any
+        that are left floating with a refcount of 0.
+        
+        * kjs/internal.cpp:
+        (KJS::Parser::saveNewNode):
+        (KJS::clearNewNodes):
+        (KJS::Parser::parse):
+        * kjs/internal.h:
+        * kjs/nodes.cpp:
+        (Node::Node):
+        * kjs/nodes.h:
+        (KJS::Node::refcount):
+
 2005-08-26  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/internal.cpp

@@ -351 +351 @@
 int Parser::sid = 0;
 
+const int initialCapacity = 64;
+const int growthFactor = 2;
+
+static int numNewNodes;
+static int newNodesCapacity;
+static Node **newNodes;
+
+void Parser::saveNewNode(Node *node)
+{
+  if (numNewNodes == newNodesCapacity) {
+    newNodesCapacity = (newNodesCapacity == 0) ? initialCapacity : newNodesCapacity * growthFactor;
+    newNodes = (Node **)realloc(newNodes, sizeof(Node *) * newNodesCapacity);
+  }
+
+  newNodes[numNewNodes++] = node;
+}
+
+static void clearNewNodes()
+{
+  for (int i = 0; i < numNewNodes; i++) {
+    if (newNodes[i]->refcount() == 0)
+      delete newNodes[i];
+  }
+  delete newNodes;
+  newNodes = 0;
+  numNewNodes = 0;
+  newNodesCapacity = 0;
+}
+
 SharedPtr<ProgramNode> Parser::parse(const UString &sourceURL, int startingLineNumber,
                                      const UChar *code, unsigned int length, int *sourceId,
@@ -376 +405 @@
   *progNode = 0;
 
+  clearNewNodes();
+
   if (parseError || lexError) {
     int eline = Lexer::curr()->lineNo();
@@ -392 +423 @@
   *progNode = prog;
 }
-
 
 // ------------------------------ InterpreterImp -------------------------------

trunk/JavaScriptCore/kjs/internal.h

@@ -39 +39 @@
 namespace KJS {
 
+  class Node;
   class ProgramNode;
   class FunctionBodyNode;
@@ -201 +202 @@
     static void accept(ProgramNode *prog);
 
+    static void saveNewNode(Node *node);
+
     static int sid;
   };

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -100 +100 @@
   sourceURL = Lexer::curr()->sourceURL();
   m_refcount = 0;
+  Parser::saveNewNode(this);
 }
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -95 +95 @@
     void ref() { ++m_refcount; }
     void deref() { --m_refcount; if (!m_refcount) delete this; }
+    unsigned int refcount() { return m_refcount; }
 
   protected: