[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 79fe658d22dfb9bd6b8917be335f0e66a8341f50
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 15 16:26:23 2004 +0000

            Reviewed by Ken.
    
            - fixed 3529943: REGRESSION (119-120): nil-deref in KHTMLPart::javaEnabled when hitting back button
    
            * khtml/html/html_objectimpl.cpp: (HTMLAppletElementImpl::getAppletInstance):
            Add missing nil check that the other call to javaEnabled has.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5908 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 10ff144..a3bc06a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-01-15  Darin Adler  <darin at apple.com>
+
+        Reviewed by Ken.
+
+        - fixed 3529943: REGRESSION (119-120): nil-deref in KHTMLPart::javaEnabled when hitting back button
+
+        * khtml/html/html_objectimpl.cpp: (HTMLAppletElementImpl::getAppletInstance):
+        Add missing nil check that the other call to javaEnabled has.
+
 === Safari-122 ===
 
 2004-01-14  David Hyatt  <hyatt at apple.com>
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index a27353d..2aa8090 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -176,9 +176,9 @@ bool HTMLAppletElementImpl::callMember(const QString & name, const QStringList &
 #if APPLE_CHANGES
 KJS::Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
 {
-	KHTMLPart* part = getDocument()->part();
-	if (!part->javaEnabled())
-		return 0;
+    KHTMLPart* part = getDocument()->part();
+    if (!part || !part->javaEnabled())
+        return 0;
 
     if (appletInstance)
         return appletInstance;
@@ -190,7 +190,7 @@ KJS::Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
             // Call into the part (and over the bridge) to pull the Bindings::Instance
             // from the guts of the Java VM.
             void *_view = r->widget()->getView();
-            appletInstance = part ? KWQ(part)->getAppletInstanceForView((NSView *)_view) : 0;
+            appletInstance = KWQ(part)->getAppletInstanceForView((NSView *)_view);
         }
     }
     return appletInstance;

-- 
WebKit Debian packaging