[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

andersca at apple.com andersca at apple.com
Wed Dec 22 18:31:40 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 495202f9deb594827146b784094ed5b84027c0ee
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 13 18:27:11 2010 +0000

    Crash when clicking a download link that targets a new tab
    https://bugs.webkit.org/show_bug.cgi?id=50935
    <rdar://problem/8760572>
    
    Reviewed by John Sullivan.
    
    Check for a null history item.
    
    * WebProcess/Downloads/mac/DownloadMac.mm:
    (WebKit::originatingURLFromBackForwardList):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 246d769..93475fa 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-12-13  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by John Sullivan.
+
+        Crash when clicking a download link that targets a new tab
+        https://bugs.webkit.org/show_bug.cgi?id=50935
+        <rdar://problem/8760572>
+
+        Check for a null history item.
+
+        * WebProcess/Downloads/mac/DownloadMac.mm:
+        (WebKit::originatingURLFromBackForwardList):
+
 2010-12-13  Andras Becsi  <abecsi at webkit.org>
 
         Reviewed by Csaba Osztrogonác.
diff --git a/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm b/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
index 0f3c669..2ffa320 100644
--- a/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
+++ b/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm
@@ -68,7 +68,11 @@ static KURL originatingURLFromBackForwardList(WebPage *webPage)
     for (int backIndex = 0; backIndex <= backCount; backIndex++) {
         // FIXME: At one point we had code here to check a "was user gesture" flag.
         // Do we need to restore that logic?
-        originalURL = page->backForward()->itemAtIndex(-backIndex)->originalURL(); 
+        HistoryItem *historyItem = page->backForward()->itemAtIndex(-backIndex);
+        if (!historyItem)
+            continue;
+
+        originalURL = historyItem->originalURL(); 
         if (!originalURL.isNull()) 
             return originalURL;
     }

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list