[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 fa44157072b884c884cb3f57e3b71e23a4ab81a0
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 30 20:59:16 2003 +0000

            Reviewed by NOBODY (OOPS!).
    
    	- fixed 3427069 - browsing mp3.com causes leaks (KJS)
    
            * kjs/string_object.cpp:
            (StringProtoFuncImp::call): Don't do an early return, since that
    	could leak a temporary regexp.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5315 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 045c203..865e91a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-30  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+	- fixed 3427069 - browsing mp3.com causes leaks (KJS)
+	
+        * kjs/string_object.cpp:
+        (StringProtoFuncImp::call): Don't do an early return, since that
+	could leak a temporary regexp.
+
 2003-10-29  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/JavaScriptCore/kjs/string_object.cpp b/JavaScriptCore/kjs/string_object.cpp
index 60bc29f..eda5eb1 100644
--- a/JavaScriptCore/kjs/string_object.cpp
+++ b/JavaScriptCore/kjs/string_object.cpp
@@ -276,10 +276,12 @@ Value StringProtoFuncImp::call(ExecState *exec, Object &thisObj, const List &arg
       // Exec
       if ((reg->flags() & RegExp::Global) == 0) {
 	// case without 'g' flag is handled like RegExp.prototype.exec
-	if (mstr.isNull())
-	  return Null(); // no match
-	regExpObj->setSubPatterns(reg->subPatterns());
-	result = regExpObj->arrayOfMatches(exec,mstr);
+	if (mstr.isNull()) {
+	  result = Null();
+	} else {
+	  regExpObj->setSubPatterns(reg->subPatterns());
+	  result = regExpObj->arrayOfMatches(exec,mstr);
+	}
       } else {
 	// return array of matches
 	List list;

-- 
WebKit Debian packaging