[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[ggaren at apple.com]

The following commit has been merged in the webkit-1.3 branch:
commit d2f61674ca8ea34abbc2ae36f80fb18abf603406
Author: ggaren at apple.com <ggaren at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 31 03:36:07 2011 +0000

    2011-01-30  Geoffrey Garen  <ggaren at apple.com>
    
            Reviewed by Maciej Stachowiak.
    
            Fixed crash on window close (maybe crash on launch?) due to missing
            frame null checks
            https://bugs.webkit.org/show_bug.cgi?id=53408
    
            * UIProcess/WebContext.cpp:
            (WebKit::WebContext::didNavigateWithNavigationData):
            (WebKit::WebContext::didPerformClientRedirect):
            (WebKit::WebContext::didPerformServerRedirect):
            (WebKit::WebContext::didUpdateHistoryTitle): Check for NULL, since we're
            calling a function that can return it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77102 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 2ce4869..4b745f8 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-30  Geoffrey Garen  <ggaren at apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        Fixed crash on window close (maybe crash on launch?) due to missing
+        frame null checks
+        https://bugs.webkit.org/show_bug.cgi?id=53408
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::didNavigateWithNavigationData):
+        (WebKit::WebContext::didPerformClientRedirect):
+        (WebKit::WebContext::didPerformServerRedirect):
+        (WebKit::WebContext::didUpdateHistoryTitle): Check for NULL, since we're
+        calling a function that can return it.
+
 2011-01-30  Balazs Kelemen  <kbalazs at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/Source/WebKit2/UIProcess/WebContext.cpp b/Source/WebKit2/UIProcess/WebContext.cpp
index 143277c..7d9b798 100644
--- a/Source/WebKit2/UIProcess/WebContext.cpp
+++ b/Source/WebKit2/UIProcess/WebContext.cpp
@@ -299,7 +299,7 @@ void WebContext::didReceiveSynchronousMessageFromInjectedBundle(const String& me
 void WebContext::didNavigateWithNavigationData(uint64_t pageID, const WebNavigationDataStore& store, uint64_t frameID) 
 {
     WebFrameProxy* frame = m_process->webFrame(frameID);
-    if (!frame->page())
+    if (!frame || !frame->page())
         return;
     
     m_historyClient.didNavigateWithNavigationData(this, frame->page(), store, frame);
@@ -308,7 +308,7 @@ void WebContext::didNavigateWithNavigationData(uint64_t pageID, const WebNavigat
 void WebContext::didPerformClientRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
 {
     WebFrameProxy* frame = m_process->webFrame(frameID);
-    if (!frame->page())
+    if (!frame || !frame->page())
         return;
     
     m_historyClient.didPerformClientRedirect(this, frame->page(), sourceURLString, destinationURLString, frame);
@@ -317,7 +317,7 @@ void WebContext::didPerformClientRedirect(uint64_t pageID, const String& sourceU
 void WebContext::didPerformServerRedirect(uint64_t pageID, const String& sourceURLString, const String& destinationURLString, uint64_t frameID)
 {
     WebFrameProxy* frame = m_process->webFrame(frameID);
-    if (!frame->page())
+    if (!frame || !frame->page())
         return;
     
     m_historyClient.didPerformServerRedirect(this, frame->page(), sourceURLString, destinationURLString, frame);
@@ -326,7 +326,7 @@ void WebContext::didPerformServerRedirect(uint64_t pageID, const String& sourceU
 void WebContext::didUpdateHistoryTitle(uint64_t pageID, const String& title, const String& url, uint64_t frameID)
 {
     WebFrameProxy* frame = m_process->webFrame(frameID);
-    if (!frame->page())
+    if (!frame || !frame->page())
         return;
 
     m_historyClient.didUpdateHistoryTitle(this, frame->page(), title, url, frame);

-- 
WebKit Debian packaging