[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit b1d5741de1f4925a7ec50bedf2c993dc3946ced7
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 29 00:10:07 2003 +0000

            Reviewed by Richard.
    
    	- fixed 3240814 - LEAK: 120 byte leak in JavaScript parser in Sherlock Movies channel
    
            * kjs/internal.cpp:
            (Parser::parse): ref() and deref() the program node, to make sure to clean up properly,
    	before deleting it.
            (InterpreterImp::checkSyntax): Likewise.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4724 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ccb13ce..001f7e2 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3240814 - LEAK: 120 byte leak in JavaScript parser in Sherlock Movies channel
+	
+        * kjs/internal.cpp:
+        (Parser::parse): ref() and deref() the program node, to make sure to clean up properly,
+	before deleting it.
+        (InterpreterImp::checkSyntax): Likewise.
+
 === Safari-90 ===
 
 2003-07-22  Maciej Stachowiak  <mjs at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index ccb13ce..001f7e2 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,14 @@
+2003-07-28  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Richard.
+
+	- fixed 3240814 - LEAK: 120 byte leak in JavaScript parser in Sherlock Movies channel
+	
+        * kjs/internal.cpp:
+        (Parser::parse): ref() and deref() the program node, to make sure to clean up properly,
+	before deleting it.
+        (InterpreterImp::checkSyntax): Likewise.
+
 === Safari-90 ===
 
 2003-07-22  Maciej Stachowiak  <mjs at apple.com>
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 00666e4..a53dece 100644
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -455,7 +455,12 @@ ProgramNode *Parser::parse(const UChar *code, unsigned int length, int *sourceId
       *errLine = eline;
     if (errMsg)
       *errMsg = "Parse error at line " + UString::from(eline);
-    delete prog;
+    if (prog) {
+      // must ref and deref to clean up properly
+      prog->ref();
+      prog->deref();
+      delete prog;
+    }
     return 0;
   }
 
@@ -725,7 +730,12 @@ bool InterpreterImp::checkSyntax(const UString &code)
   // Parser::parse() returns 0 in a syntax error occurs, so we just check for that
   ProgramNode *progNode = Parser::parse(code.data(),code.size(),0,0,0);
   bool ok = (progNode != 0);
-  delete progNode;
+  if (progNode) {
+    // must ref and deref to clean up properly
+    progNode->ref();
+    progNode->deref();
+    delete progNode;
+  }
   return ok;
 }
 

-- 
WebKit Debian packaging