Changeset 10354 in webkit for trunk/JavaScriptCore/kjs/internal.cpp

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):

File:

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

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 -------------------------------