[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[zecke at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e305192f0e197bb16ab5f4b9a0bfa7221ea907b2
Author: zecke at webkit.org <zecke at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 23 16:38:37 2009 +0000

    2009-09-23  Holger Hans Peter Freyther  <zecke at selfish.org>
    
            Rubber-stamped by Simon Hausmann.
    
            Add a null check for the Document*. In the mirror benchmarking
            application a crash from a call from JavaScript was observed.
    
            I was not able to come up with a test case for this issue.
    
            * platform/qt/CookieJarQt.cpp:
            (WebCore::cookieJar):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dad6eeb..24dc88d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-23  Holger Hans Peter Freyther  <zecke at selfish.org>
+
+        Rubber-stamped by Simon Hausmann.
+
+        Add a null check for the Document*. In the mirror benchmarking
+        application a crash from a call from JavaScript was observed.
+
+        I was not able to come up with a test case for this issue.
+
+        * platform/qt/CookieJarQt.cpp:
+        (WebCore::cookieJar):
+
 2009-09-23  Simon Hausmann  <simon.hausmann at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/platform/qt/CookieJarQt.cpp b/WebCore/platform/qt/CookieJarQt.cpp
index 56d3372..a27a06e 100644
--- a/WebCore/platform/qt/CookieJarQt.cpp
+++ b/WebCore/platform/qt/CookieJarQt.cpp
@@ -48,6 +48,8 @@ namespace WebCore {
 #if QT_VERSION >= 0x040400
 static QNetworkCookieJar *cookieJar(const Document *document)
 {
+    if (!document)
+        return 0;
     Frame *frame = document->frame();
     if (!frame)
         return 0;

-- 
WebKit Debian packaging