[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 0b83c7c3fead3f12778035acd7febbb5a662c783
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Apr 29 15:24:22 2004 +0000

            Reviewed by Ken.
    
            - fixed <rdar://problem/3636673>: "unrepro nil-deref crash in KHTMLPart::frameDetached() (espn.com)"
    
            * kwq/KWQKHTMLPart.mm: (KHTMLPart::frameDetached): Check for nil.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 076480e..7dc4eb0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2004-04-29  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed <rdar://problem/3636673>: "unrepro nil-deref crash in KHTMLPart::frameDetached() (espn.com)"
+
+        * kwq/KWQKHTMLPart.mm: (KHTMLPart::frameDetached): Check for nil.
+
 2004-04-28  Chris Blumenberg  <cblu at apple.com>
 
 	- Implemented DOMHTMLElementExtensions.
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 038b3f8..00566d9 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -673,13 +673,16 @@ void KHTMLPart::frameDetached()
     KWQ_UNBLOCK_EXCEPTIONS;
 
     // FIXME: There may be a better place to do this that works for KHTML too.
-    FrameList& parentFrames = parentPart()->d->m_frames;
-    FrameIt end = parentFrames.end();
-    for (FrameIt it = parentFrames.begin(); it != end; ++it) {
-        if ((*it).m_part == this) {
-            parentFrames.remove(it);
-            deref();
-            break;
+    KHTMLPart *parent = parentPart();
+    if (parent) {
+        FrameList& parentFrames = parent->d->m_frames;
+        FrameIt end = parentFrames.end();
+        for (FrameIt it = parentFrames.begin(); it != end; ++it) {
+            if ((*it).m_part == this) {
+                parentFrames.remove(it);
+                deref();
+                break;
+            }
         }
     }
 }

-- 
WebKit Debian packaging