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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit e34ee76f00b30d859a5df9a9905df09d19bf4896
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jun 13 18:51:32 2003 +0000

    	Fixed 3291537.
            Reviewed by John.
    
            * kwq/KWQObject.mm:
            (QObject::killTimer):
            Only remove the timer is it hasn't fired (and is therefore valid).
      	It is NOT permissible to reference a timer's userInfo if it is invalid.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4541 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 797091e..61e85da 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,10 @@
+2003-06-13  Richard Williamson  <rjw at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * kwq/KWQObject.mm:
+        (QObject::killTimer):
+
 === Safari-84 ===
 
 2003-06-12  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 797091e..61e85da 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-06-13  Richard Williamson  <rjw at apple.com>
+
+        Reviewed by NOBODY (OOPS!).
+
+        * kwq/KWQObject.mm:
+        (QObject::killTimer):
+
 === Safari-84 ===
 
 2003-06-12  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/kwq/KWQObject.mm b/WebCore/kwq/KWQObject.mm
index 1a1fed0..a716afa 100644
--- a/WebCore/kwq/KWQObject.mm
+++ b/WebCore/kwq/KWQObject.mm
@@ -264,8 +264,12 @@ void QObject::killTimer(int _timerId)
     NSMutableDictionary *timers = (NSMutableDictionary *)CFDictionaryGetValue(timerDictionaries, this);
     NSNumber *timerId = [NSNumber numberWithInt:_timerId];
     NSTimer *timer = (NSTimer *)[timers objectForKey:timerId];
-    [deferredTimers removeObject:(KWQObjectTimerTarget *)[timer userInfo]];
-    [timer invalidate];
+    // Only try to remove the timer is it hasn't fired (and is therefore valid).  It is NOT
+    // permissible to reference a timer's userInfo if it is invalid.
+    if ([timer isValid]){
+        [deferredTimers removeObject:(KWQObjectTimerTarget *)[timer userInfo]];
+        [timer invalidate];
+    }
     [timers removeObjectForKey:timerId];
 }
 

-- 
WebKit Debian packaging