[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 5758f346c8c0eca113debe791d37c77274658493
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 8 06:04:13 2003 +0000

            - fixed <rdar://problem/3502655>: REGRESSION: Repro crash at espn.com
    
            Reviewed by Darin.
    
            * khtml/html/html_objectimpl.cpp:
            (HTMLAppletElementImpl::getAppletInstance):
            Check for nil RenderApplet before dereferencing rather than after.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5713 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 05156dd..080de95 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2003-12-06  John Sullivan  <sullivan at apple.com>
+
+        - fixed <rdar://problem/3502655>: REGRESSION: Repro crash at espn.com
+
+        Reviewed by Darin.
+
+        * khtml/html/html_objectimpl.cpp:
+        (HTMLAppletElementImpl::getAppletInstance):
+        Check for nil RenderApplet before dereferencing rather than after.
+
 2003-12-05  David Hyatt  <hyatt at apple.com>
 
 	Add support for link clicking as an accessibility action.
diff --git a/WebCore/khtml/html/html_objectimpl.cpp b/WebCore/khtml/html/html_objectimpl.cpp
index 2a15a6f..e03b0c7 100644
--- a/WebCore/khtml/html/html_objectimpl.cpp
+++ b/WebCore/khtml/html/html_objectimpl.cpp
@@ -175,13 +175,15 @@ Bindings::Instance *HTMLAppletElementImpl::getAppletInstance() const
         return appletInstance;
     
     RenderApplet *r = static_cast<RenderApplet*>(m_render);
-    r->createWidgetIfNecessary();
-    if (r && r->widget()){
-        // 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();
-        KHTMLPart* part = getDocument()->part();
-        appletInstance = part ? KWQ(part)->getAppletInstanceForView((NSView *)_view) : 0;
+    if (r) {
+        r->createWidgetIfNecessary();
+        if (r->widget()){
+            // 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();
+            KHTMLPart* part = getDocument()->part();
+            appletInstance = part ? KWQ(part)->getAppletInstanceForView((NSView *)_view) : 0;
+        }
     }
     return appletInstance;
 }

-- 
WebKit Debian packaging