[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 9b33efdba38b2dfeb59f0966827adc8b64568971
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 2 04:26:18 2003 +0000

            Reviewed by Don.
    
    	- fixed 3137566 -- non-reproducible nil-dereference in KHTMLView::clearPart
    	deallocating KWQPageState
    
            * kwq/KWQPageState.mm: (-[KWQPageState dealloc]): Add nil check.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3228 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 731a115..0a0e940 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-01-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3137566 -- non-reproducible nil-dereference in KHTMLView::clearPart
+	deallocating KWQPageState
+
+        * kwq/KWQPageState.mm: (-[KWQPageState dealloc]): Add nil check.
+
 2003-01-01  David Hyatt  <hyatt at apple.com>
 
 	Fix tables so that malformations inside them are properly pulled
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 731a115..0a0e940 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-01-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3137566 -- non-reproducible nil-dereference in KHTMLView::clearPart
+	deallocating KWQPageState
+
+        * kwq/KWQPageState.mm: (-[KWQPageState dealloc]): Add nil check.
+
 2003-01-01  David Hyatt  <hyatt at apple.com>
 
 	Fix tables so that malformations inside them are properly pulled
diff --git a/WebCore/kwq/KWQPageState.mm b/WebCore/kwq/KWQPageState.mm
index 44f3e6f..fb99183 100644
--- a/WebCore/kwq/KWQPageState.mm
+++ b/WebCore/kwq/KWQPageState.mm
@@ -77,7 +77,10 @@ using KJS::SavedProperties;
     if (document) {
         KHTMLView *view = document->view();
 
-        ASSERT (view);
+        // FIXME: We see evidence that view is nil in backtraces
+        // from the field. So we know this assert would sometimes fire.
+        // We check for nil below anyway until we figure out the cause.
+        ASSERT(view);
         
         KWQKHTMLPart::clearTimers(view);
 
@@ -85,8 +88,10 @@ using KJS::SavedProperties;
         document->detach();
         document->deref();
         
-        view->clearPart();
-        delete view;
+        if (view) {
+            view->clearPart();
+            delete view;
+        }
     }
     
     delete URL;

-- 
WebKit Debian packaging