[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
sullivan at apple.com
sullivan at apple.com
Wed Dec 22 11:08:54 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 41d843004ddd9b949d391245b3da6dcd37210bba
Author: sullivan at apple.com <sullivan at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 13 20:08:21 2010 +0000
Fixed signed/unsigned problem that led to bogus contents in the array
returned by WKBackForwardListCopyBackListWithLimit().
Reviewed by Sam Weinig.
* UIProcess/WebBackForwardList.cpp:
(WebKit::WebBackForwardList::backListAsImmutableArrayWithLimit):
Cast m_current and limit to signed values in std::max call.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63238 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7fa9f67..f6e9876 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-13 John Sullivan <sullivan at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Fixed signed/unsigned problem that led to bogus contents in the array
+ returned by WKBackForwardListCopyBackListWithLimit().
+
+ * UIProcess/WebBackForwardList.cpp:
+ (WebKit::WebBackForwardList::backListAsImmutableArrayWithLimit):
+ Cast m_current and limit to signed values in std::max call.
+
2010-07-13 Steve Falkenburg <sfalken at apple.com>
Reviewed by Ada Chan.
diff --git a/WebKit2/UIProcess/WebBackForwardList.cpp b/WebKit2/UIProcess/WebBackForwardList.cpp
index 117acfa..ee4a86d 100644
--- a/WebKit2/UIProcess/WebBackForwardList.cpp
+++ b/WebKit2/UIProcess/WebBackForwardList.cpp
@@ -174,7 +174,7 @@ PassRefPtr<ImmutableArray> WebBackForwardList::backListAsImmutableArrayWithLimit
return ImmutableArray::create();
void** array = new void*[size];
- for (unsigned i = std::max(m_current - limit, 0U), j = 0; i < m_current; ++i, ++j) {
+ for (unsigned i = std::max(static_cast<int>(m_current) - static_cast<int>(limit), 0), j = 0; i < m_current; ++i, ++j) {
WebBackForwardListItem* item = m_entries[i].get();
item->ref();
array[j] = item;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list