[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6858ea6f34ec36cda31e25e5c0c4e8e14eeb9bf4
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 10 20:24:25 2009 +0000

            Reviewed by Xan Lopez.
    
            Add a missing null-check, that is causing some crash reports.
    
            * WebCoreSupport/FrameLoaderClientGtk.cpp:
            (WebKit::FrameLoaderClient::committedLoad):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51957 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 57bdbc3..ac80deb 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Xan Lopez.
 
+        Add a missing null-check, that is causing some crash reports.
+
+        * WebCoreSupport/FrameLoaderClientGtk.cpp:
+        (WebKit::FrameLoaderClient::committedLoad):
+
+2009-12-10  Gustavo Noronha Silva  <gustavo.noronha at collabora.co.uk>
+
+        Reviewed by Xan Lopez.
+
         [GTK] Should provide an API to control the IconDatabase
         https://bugs.webkit.org/show_bug.cgi?id=32334
 
diff --git a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
index bf68701..0eaa7c8 100644
--- a/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
@@ -151,7 +151,7 @@ void FrameLoaderClient::committedLoad(WebCore::DocumentLoader* loader, const cha
             frameLoader->addData(data, length);
 
         Frame* coreFrame = loader->frame();
-        if (coreFrame->document() && coreFrame->document()->isMediaDocument())
+        if (coreFrame && coreFrame->document() && coreFrame->document()->isMediaDocument())
             loader->cancelMainResourceLoad(frameLoader->client()->pluginWillHandleLoadError(loader->response()));
     }
 

-- 
WebKit Debian packaging