[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 9f7fe47b30c58901049dd829789c26523d89d844
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 9 20:11:49 2004 +0000

            Reviewed by Chris.
    
            - fixed 3510805: "PoolCleaner" in Carbon WebKit leads to overrelease and crash using color picker in BBEdit
    
            * Carbon.subproj/CarbonUtils.m: (PoolCleaner): Only do the autorelease
            pool stuff in the default run loop mode. If we're in another run loop
            mode that means we are in some Cocoa code that sets up its own autorelease
            pool; it's important that we don't release ours in that case.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5877 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Carbon.subproj/CarbonUtils.m b/WebKit/Carbon.subproj/CarbonUtils.m
index a113638..a6d0c08 100644
--- a/WebKit/Carbon.subproj/CarbonUtils.m
+++ b/WebKit/Carbon.subproj/CarbonUtils.m
@@ -1,9 +1,9 @@
 /*
- *  CarbonUtils.c
+ *  CarbonUtils.m
  *  WebKit
  *
  *  Created by Ed Voas on Mon Feb 17 2003.
- *  Copyright (c) 2003 __MyCompanyName__. All rights reserved.
+ *  Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
  *
  */
 
@@ -42,8 +42,13 @@ PoolCleaner( EventLoopTimerRef inTimer, EventLoopIdleTimerMessage inState, void
 {
 	if ( inState == kEventLoopIdleTimerStarted )
 	{
-		[sPool release];
-		sPool = [[NSAutoreleasePool allocWithZone:NULL] init];
+        CFStringRef mode = CFRunLoopCopyCurrentMode( (CFRunLoopRef)GetCFRunLoopFromEventLoop( GetCurrentEventLoop() ));
+        if ( CFEqual( mode, kCFRunLoopDefaultMode ) )
+        {
+            [sPool release];
+            sPool = [[NSAutoreleasePool allocWithZone:NULL] init];
+        }
+        CFRelease( mode );
 	}
 }
 
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8269566..a63d19c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-01-09  Darin Adler  <darin at apple.com>
+
+        Reviewed by Chris.
+
+        - fixed 3510805: "PoolCleaner" in Carbon WebKit leads to overrelease and crash using color picker in BBEdit
+
+        * Carbon.subproj/CarbonUtils.m: (PoolCleaner): Only do the autorelease
+        pool stuff in the default run loop mode. If we're in another run loop
+        mode that means we are in some Cocoa code that sets up its own autorelease
+        pool; it's important that we don't release ours in that case.
+
 2004-01-08  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by John.

-- 
WebKit Debian packaging