Changeset 5314 in webkit for trunk/JavaScriptCore/kjs/lexer.cpp

Timestamp:

Oct 30, 2003, 10:42:38 AM (22 years ago)

Author:

mjs

Message:

Reviewed by Darin.

• fixed 3426076 - Leak of JS lexer data visiting ​http://www.ebay.com

• kjs/grammar.cpp: (yyerror): Updated the commented code.
• kjs/grammar.y: Don't delete string and identifier tokens when done with them any more, they'll get cleaned up by the lexer now.
• kjs/internal.cpp: (Parser::parse): Tell lexer when done parsing.
• kjs/lexer.cpp: (Lexer::Lexer): Initialize new data members. (Lexer::lex): Use new methods to make strings and identifiers, and save them. (Lexer::makeIdentifier): Make a new Identifier and save it in an auto-growing array. (Lexer::makeUString): Likewise for UStrings. (Lexer::doneParsing): Clean up arrays of Ifentifiers and UStrings.
• kjs/lexer.h:

File:

• trunk/JavaScriptCore/kjs/lexer.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/lexer.cpp

@@ -68 +68 @@
     bol(true),
 #endif
-    current(0), next1(0), next2(0), next3(0)
+    current(0), next1(0), next2(0), next3(0),
+    strings(0), numStrings(0), stringsCapacity(0),
+    identifiers(0), numIdentifiers(0), identifiersCapacity(0)
 {
   // allocate space for read buffers
@@ -74 +76 @@
   buffer16 = new UChar[size16];
   currLexer = this;
-
 }
 
 Lexer::~Lexer()
 {
+  doneParsing();
   delete [] buffer8;
   delete [] buffer16;
@@ -503 +505 @@
         break;
       }
-      /* TODO: close leak on parse error. same holds true for String */
-      kjsyylval.ident = new KJS::Identifier(buffer16, pos16);
+      kjsyylval.ident = makeIdentifier(buffer16, pos16);
       token = IDENT;
       break;
@@ -519 +520 @@
     break;
   case String:
-    kjsyylval.ustr = new UString(buffer16, pos16);
+    kjsyylval.ustr = makeUString(buffer16, pos16);
     token = STRING;
     break;
@@ -817 +818 @@
   return true;
 }
+
+
+void Lexer::doneParsing()
+{
+  for (unsigned i = 0; i < numIdentifiers; i++) {
+    delete identifiers[i];
+  }
+  free (identifiers);
+  identifiers = 0;
+  numIdentifiers = 0;
+  identifiersCapacity = 0;
+
+  for (unsigned i = 0; i < numStrings; i++) {
+    delete strings[i];
+  }
+  free (strings);
+  strings = 0;
+  numStrings = 0;
+  stringsCapacity = 0;
+}
+
+const int initialCapacity = 64;
+const int growthFactor = 2;
+
+Identifier *Lexer::makeIdentifier(UChar *buffer, unsigned int pos)
+{
+  if (numIdentifiers == identifiersCapacity) {
+    identifiersCapacity = (identifiersCapacity == 0) ? initialCapacity : identifiersCapacity *growthFactor;
+    identifiers = (KJS::Identifier **)realloc(identifiers, sizeof(KJS::Identifier *) * identifiersCapacity);
+  }
+
+  KJS::Identifier *identifier = new KJS::Identifier(buffer16, pos16);
+  identifiers[numIdentifiers++] = identifier;
+  return identifier;
+}
+ 
+UString *Lexer::makeUString(UChar *buffer, unsigned int pos)
+{
+  if (numStrings == stringsCapacity) {
+    stringsCapacity = (stringsCapacity == 0) ? initialCapacity : stringsCapacity *growthFactor;
+    strings = (UString **)realloc(strings, sizeof(UString *) * stringsCapacity);
+  }
+
+  UString *string = new UString(buffer16, pos16);
+  strings[numStrings++] = string;
+  return string;
+}