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

[sullivan at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 6d90c0913e75a1d8247271bea5f7a538687e3f1e
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 21:05:16 2010 +0000

    <https://bugs.webkit.org/show_bug.cgi?id=43203>
    WebBackForwardList::back/ForwardListWithLimit() crashes if passed a limit larger than max int
    
    Reviewed by Sam Weinig.
    
    * UIProcess/WebBackForwardList.cpp:
    (WebKit::WebBackForwardList::backListAsImmutableArrayWithLimit):
    Fixed casting so that a large unsigned won't become a negative int.
    (WebKit::WebBackForwardList::forwardListAsImmutableArrayWithLimit):
    Ditto.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64306 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b3cc35c..1f5d579 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-29  John Sullivan  <sullivan at apple.com>
+
+        <https://bugs.webkit.org/show_bug.cgi?id=43203>
+        WebBackForwardList::back/ForwardListWithLimit() crashes if passed a limit larger than max int
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/WebBackForwardList.cpp:
+        (WebKit::WebBackForwardList::backListAsImmutableArrayWithLimit):
+        Fixed casting so that a large unsigned won't become a negative int.
+        (WebKit::WebBackForwardList::forwardListAsImmutableArrayWithLimit):
+        Ditto.
+
 2010-07-29  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKit2/UIProcess/WebBackForwardList.cpp b/WebKit2/UIProcess/WebBackForwardList.cpp
index 1a45778..3d82fd4 100644
--- a/WebKit2/UIProcess/WebBackForwardList.cpp
+++ b/WebKit2/UIProcess/WebBackForwardList.cpp
@@ -180,7 +180,7 @@ static void webBackForwardListItemDeref(const void* item)
 
 PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit(unsigned limit)
 {
-    unsigned size = std::min(backListCount(), static_cast<int>(limit));
+    unsigned size = std::min(static_cast<unsigned>(backListCount()), limit);
     if (!size)
         return ImmutableArray::create();
 
@@ -200,7 +200,7 @@ PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit
 
 PassRefPtr<ImmutableArray> WebBackForwardList::forwardListAsImmutableArrayWithLimit(unsigned limit)
 {
-    unsigned size = std::min(forwardListCount(), static_cast<int>(limit));
+    unsigned size = std::min(static_cast<unsigned>(forwardListCount()), limit);
     if (!size)
         return ImmutableArray::create();
 

-- 
WebKit Debian packaging