[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 9693d55a2ef70b125bc72b4290e0d9c9018dbc37
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 21 03:55:04 2003 +0000

            Reviewed by Dave.
    
            - fixed 3429384 -- REGRESSION (89-90): nil-deref in KHTMLPart::write() (cheshiremotorcyclesalvage.com)
    
            * khtml/khtml_part.cpp: (KHTMLPart::write): Add a nil check.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5023 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index f1c6612..568d26a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -2,6 +2,14 @@
 
         Reviewed by Dave.
 
+        - fixed 3429384 -- REGRESSION (89-90): nil-deref in KHTMLPart::write() (cheshiremotorcyclesalvage.com)
+
+        * khtml/khtml_part.cpp: (KHTMLPart::write): Add a nil check.
+
+2003-09-20  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
         - more fixes for the W3C DOM tests
 
         * khtml/dom/dom_doc.cpp: (Document::createAttributeNS): Check that the attribute name
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index f1c6612..568d26a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -2,6 +2,14 @@
 
         Reviewed by Dave.
 
+        - fixed 3429384 -- REGRESSION (89-90): nil-deref in KHTMLPart::write() (cheshiremotorcyclesalvage.com)
+
+        * khtml/khtml_part.cpp: (KHTMLPart::write): Add a nil check.
+
+2003-09-20  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
         - more fixes for the W3C DOM tests
 
         * khtml/dom/dom_doc.cpp: (Document::createAttributeNS): Check that the attribute name
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index d2f901e..7bef1bc 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -1521,7 +1521,7 @@ void KHTMLPart::write( const char *str, int len )
                 d->m_haveEncoding ? Decoder::UserChosenEncoding : Decoder::EncodingFromHTTPHeader);
         else {
             // Inherit the default encoding from the parent frame if there is one.
-            const char *defaultEncoding = parentPart()
+            const char *defaultEncoding = (parentPart() && parentPart()->d->m_decoder)
                 ? parentPart()->d->m_decoder->encoding() : settings()->encoding().latin1();
             d->m_decoder->setEncoding(defaultEncoding, Decoder::DefaultEncoding);
         }

-- 
WebKit Debian packaging