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

beidson at apple.com beidson at apple.com
Sun Feb 20 23:13:15 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 0e7ea9b0047f9967bf439cfec11fd9108dfa6368
Author: beidson at apple.com <beidson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 19 01:46:50 2011 +0000

    <rdar://problem/8860833> and https://bugs.webkit.org/show_bug.cgi?id=52599
    UIProcess crash in WebPageProxy::reattachToWebProcess when web process crashes with a new tab/window.
    
    Reviewed by Darin Adler.
    
    * UIProcess/WebPageProxy.cpp:
    (WebKit::WebPageProxy::reattachToWebProcessWithItem): Null check item *both* places it is used.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76089 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 4304c57..9779e1a 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,5 +1,15 @@
 2011-01-18  Brady Eidson  <beidson at apple.com>
 
+        Reviewed by Darin Adler.
+
+        <rdar://problem/8860833> and https://bugs.webkit.org/show_bug.cgi?id=52599
+        UIProcess crash in WebPageProxy::reattachToWebProcess when web process crashes with a new tab/window.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::reattachToWebProcessWithItem): Null check item *both* places it is used.
+
+2011-01-18  Brady Eidson  <beidson at apple.com>
+
         Reviewed by Maciej Stachowiak. 
 
         <rdar://problem/8752200> and https://bugs.webkit.org/show_bug.cgi?id=52664
diff --git a/Source/WebKit2/UIProcess/WebPageProxy.cpp b/Source/WebKit2/UIProcess/WebPageProxy.cpp
index d012ce7..4ff6888 100644
--- a/Source/WebKit2/UIProcess/WebPageProxy.cpp
+++ b/Source/WebKit2/UIProcess/WebPageProxy.cpp
@@ -227,7 +227,9 @@ void WebPageProxy::reattachToWebProcessWithItem(WebBackForwardListItem* item)
         m_backForwardList->goToItem(item);
     
     reattachToWebProcess();
-    process()->send(Messages::WebPage::GoToBackForwardItem(item->itemID()), m_pageID);
+    
+    if (item)
+        process()->send(Messages::WebPage::GoToBackForwardItem(item->itemID()), m_pageID);
 }
 
 void WebPageProxy::initializeWebPage()

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list