[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 ed7e5d4cf545eb4701a5829fc84bbe137fe7f067
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 1 23:00:39 2002 +0000

    	- fixed 3090249 -- random crash on page load
    	- fixed 3090286 -- assert _job in KWQResourceLoader cancel
    
            * kwq/KWQResourceLoader.mm: (-[KWQResourceLoader cancel]):
    	This function needs to handle the case where the load is already cancelled.
    	I think this also caused Avie's crash.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2531 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 180762d..5bdfea9 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-11-01  Darin Adler  <darin at apple.com>
+
+	- fixed 3090249 -- random crash on page load
+	- fixed 3090286 -- assert _job in KWQResourceLoader cancel
+
+        * kwq/KWQResourceLoader.mm: (-[KWQResourceLoader cancel]):
+	This function needs to handle the case where the load is already cancelled.
+	I think this also caused Avie's crash.
+
 2002-10-31  Darin Adler  <darin at apple.com>
 
 	- fixed huge leak when doing page load test
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 180762d..5bdfea9 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-11-01  Darin Adler  <darin at apple.com>
+
+	- fixed 3090249 -- random crash on page load
+	- fixed 3090286 -- assert _job in KWQResourceLoader cancel
+
+        * kwq/KWQResourceLoader.mm: (-[KWQResourceLoader cancel]):
+	This function needs to handle the case where the load is already cancelled.
+	I think this also caused Avie's crash.
+
 2002-10-31  Darin Adler  <darin at apple.com>
 
 	- fixed huge leak when doing page load test
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 180762d..5bdfea9 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2002-11-01  Darin Adler  <darin at apple.com>
+
+	- fixed 3090249 -- random crash on page load
+	- fixed 3090286 -- assert _job in KWQResourceLoader cancel
+
+        * kwq/KWQResourceLoader.mm: (-[KWQResourceLoader cancel]):
+	This function needs to handle the case where the load is already cancelled.
+	I think this also caused Avie's crash.
+
 2002-10-31  Darin Adler  <darin at apple.com>
 
 	- fixed huge leak when doing page load test
diff --git a/WebCore/kwq/KWQResourceLoader.mm b/WebCore/kwq/KWQResourceLoader.mm
index 8e97c9c..d0ec3e9 100644
--- a/WebCore/kwq/KWQResourceLoader.mm
+++ b/WebCore/kwq/KWQResourceLoader.mm
@@ -80,16 +80,15 @@ using KIO::TransferJob;
 
 - (void)cancel
 {
-    ASSERT(_job);
-    ASSERT(_handle);
-
     TransferJob *job = _job;
     id <WebCoreResourceHandle> handle = _handle;
     _job = 0;
     _handle = nil;
 
-    job->setError(1);
-    job->setLoader(nil);
+    if (job) {
+        job->setError(1);
+        job->setLoader(nil);
+    }
     [handle release];
 }
 

-- 
WebKit Debian packaging