[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 e77998992084e02b6fd20187c11b72fadd2a38f0
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 26 15:57:57 2003 +0000

            - one more small step to make -[KWQPageState dealloc] safer
    
            * kwq/KWQPageState.mm: (-[KWQPageState dealloc]): Only do the real detach() if the
            document is already in the detached state; we don't want to detach twice.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5852 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4c538bc..c1ab3df 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,10 @@
+2003-12-26  Darin Adler  <darin at apple.com>
+
+        - one more small step to make -[KWQPageState dealloc] safer
+
+        * kwq/KWQPageState.mm: (-[KWQPageState dealloc]): Only do the real detach() if the
+        document is already in the detached state; we don't want to detach twice.
+
 2003-12-23  John Sullivan  <sullivan at apple.com>
 
         - fixed <rdar://problem/3451306>: address book search fails at Airborne 
@@ -8,9 +15,7 @@
         * khtml/ecma/kjs_html.cpp:
         commented out definition of document.all; now sites like this one that
         set document.all to a value will work.
-        * khtml/ecma/kjs_html.lut.h:
-        (KJS::):
-        regenerated this file
+        * khtml/ecma/kjs_html.lut.h: regenerated this file
 
 2003-12-23  Darin Adler  <darin at apple.com>
 
diff --git a/WebCore/kwq/KWQPageState.mm b/WebCore/kwq/KWQPageState.mm
index c502c3f..62f8d18 100644
--- a/WebCore/kwq/KWQPageState.mm
+++ b/WebCore/kwq/KWQPageState.mm
@@ -118,8 +118,11 @@ using KJS::SavedBuiltins;
 
         KWQKHTMLPart::clearTimers(view);
 
+        bool detached = document->renderer() == 0;
         document->setInPageCache(NO);
-        document->detach();
+        if (detached) {
+            document->detach();
+        }
         document->deref();
         
         if (view) {

-- 
WebKit Debian packaging