[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 239e2207b8b78908b8a4fa9f9a694aaa4ab9c69b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 22 21:28:55 2003 +0000

            Reviewed by Maciej.
    
    	- fixed 3137084 -- Many non-reproducible crashers in ContextImp::mark / ScopeChain::mark
    
            * kjs/scope_chain.cpp: (ScopeChain::push): Add assertion.
            (ScopeChain::release): Fix while loop so that it decrements refCount of the first node in
            the chain too.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3403 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 3d04ff8..33eeefe 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3137084 -- Many non-reproducible crashers in ContextImp::mark / ScopeChain::mark
+
+        * kjs/scope_chain.cpp: (ScopeChain::push): Add assertion.
+        (ScopeChain::release): Fix while loop so that it decrements refCount of the first node in
+        the chain too.
+
 2003-01-21  Darin Adler  <darin at apple.com>
 
         - correct our copyrights to 2003; copyright is based on year of publication, not year worked on
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 3d04ff8..33eeefe 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,13 @@
+2003-01-22  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+	- fixed 3137084 -- Many non-reproducible crashers in ContextImp::mark / ScopeChain::mark
+
+        * kjs/scope_chain.cpp: (ScopeChain::push): Add assertion.
+        (ScopeChain::release): Fix while loop so that it decrements refCount of the first node in
+        the chain too.
+
 2003-01-21  Darin Adler  <darin at apple.com>
 
         - correct our copyrights to 2003; copyright is based on year of publication, not year worked on
diff --git a/JavaScriptCore/kjs/scope_chain.cpp b/JavaScriptCore/kjs/scope_chain.cpp
index cc76792..6ec5a2d 100644
--- a/JavaScriptCore/kjs/scope_chain.cpp
+++ b/JavaScriptCore/kjs/scope_chain.cpp
@@ -43,6 +43,7 @@ ScopeChain &ScopeChain::operator=(const ScopeChain &c)
 
 void ScopeChain::push(ObjectImp *o)
 {
+    assert(o);
     _node = new ScopeChainNode(_node, o);
 }
 
@@ -64,11 +65,11 @@ void ScopeChain::pop()
 void ScopeChain::release()
 {
     ScopeChainNode *n = _node;
-    do {
+    while (n && --n->refCount == 0) {
         ScopeChainNode *next = n->next;
         delete n;
         n = next;
-    } while (n && --n->refCount == 0);
+    }
 }
 
 void ScopeChain::mark()

-- 
WebKit Debian packaging