summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android
diff options
context:
space:
mode:
authorRussell Brenner <russellbrenner@google.com>2011-11-29 16:42:06 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-29 16:42:06 -0800
commit57575d9ddf16a2fb5ad9fc4e539db311f6db6553 (patch)
treeaca104c21cf951c0b5ec7de6bc241d7015b39bd7 /Source/WebKit/android
parent379587b453a8a48bc0ca02ff5b8ebc489b64fce8 (diff)
parent54dddd414a10f9c661f181d016b49b1803373ed3 (diff)
downloadexternal_webkit-57575d9ddf16a2fb5ad9fc4e539db311f6db6553.zip
external_webkit-57575d9ddf16a2fb5ad9fc4e539db311f6db6553.tar.gz
external_webkit-57575d9ddf16a2fb5ad9fc4e539db311f6db6553.tar.bz2
Merge "Use unsigned length when reading data"
Diffstat (limited to 'Source/WebKit/android')
-rw-r--r--Source/WebKit/android/jni/WebHistory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebHistory.cpp b/Source/WebKit/android/jni/WebHistory.cpp
index 8453974..42a7ecf 100644
--- a/Source/WebKit/android/jni/WebHistory.cpp
+++ b/Source/WebKit/android/jni/WebHistory.cpp
@@ -490,7 +490,7 @@ static bool read_item_recursive(WebCore::HistoryItem* newItem,
// Read the original url
// Read the expected length of the string.
- int l;
+ size_t l;
memcpy(&l, data, sizeofUnsigned);
// Increment data pointer by the size of an unsigned int.
data += sizeofUnsigned;