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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 2a4fb6fee9b6f67b3895e58a69e4992193517e0d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 29 18:45:24 2003 +0000

            Reviewed by John.
    
            * kjs/scope_chain.cpp: Rolled out the fix to bug 3137084.
            It caused a massive storage leak, and probably didn't even fix the bug.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3490 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1f038fa..72f0cd1 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        * kjs/scope_chain.cpp: Rolled out the fix to bug 3137084.
+        It caused a massive storage leak, and probably didn't even fix the bug.
+
 2003-01-28  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 1f038fa..72f0cd1 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2003-01-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        * kjs/scope_chain.cpp: Rolled out the fix to bug 3137084.
+        It caused a massive storage leak, and probably didn't even fix the bug.
+
 2003-01-28  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/JavaScriptCore/kjs/scope_chain.cpp b/JavaScriptCore/kjs/scope_chain.cpp
index 6ec5a2d..b0c3bd3 100644
--- a/JavaScriptCore/kjs/scope_chain.cpp
+++ b/JavaScriptCore/kjs/scope_chain.cpp
@@ -64,12 +64,15 @@ void ScopeChain::pop()
 
 void ScopeChain::release()
 {
+    // This function is only called by deref(),
+    // Deref ensures these conditions are true.
+    assert(_node && _node->refCount == 0);
     ScopeChainNode *n = _node;
-    while (n && --n->refCount == 0) {
+    do {
         ScopeChainNode *next = n->next;
         delete n;
         n = next;
-    }
+    } while (n && --n->refCount == 0);
 }
 
 void ScopeChain::mark()

-- 
WebKit Debian packaging