[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 7a48fa4171730d70ea9c0a729dd715906bd2c100
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 9 22:26:20 2003 +0000

            Reviewed by John.
    
    	<rdar://problem/3505183>: JavaScriptCore should assert that interpreter is locked in collector
    
            * kjs/collector.cpp:
            (KJS::Collector::allocate): Assert that interpreter lock count is not 0.
            (KJS::Collector::collect): likewise
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5730 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b0865f6..3e3724a 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2003-12-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	<rdar://problem/3505183>: JavaScriptCore should assert that interpreter is locked in collector
+
+        * kjs/collector.cpp:
+        (KJS::Collector::allocate): Assert that interpreter lock count is not 0.
+        (KJS::Collector::collect): likewise
+
 2003-12-08  Richard Williamson   <rjw at apple.com>
 
 	LiveConnect:  The last piece of the JavaScript side of the
diff --git a/JavaScriptCore/kjs/collector.cpp b/JavaScriptCore/kjs/collector.cpp
index ef371c0..ec6cfb6 100644
--- a/JavaScriptCore/kjs/collector.cpp
+++ b/JavaScriptCore/kjs/collector.cpp
@@ -88,6 +88,8 @@ bool Collector::memoryFull = false;
 
 void* Collector::allocate(size_t s)
 {
+  assert(Interpreter::lockCount() > 0);
+
   if (s == 0)
     return 0L;
   
@@ -162,6 +164,8 @@ void* Collector::allocate(size_t s)
 
 bool Collector::collect()
 {
+  assert(Interpreter::lockCount() > 0);
+
   bool deleted = false;
 
   // MARK: first mark all referenced objects recursively

-- 
WebKit Debian packaging