diff options
| author | Russell Brenner <russellbrenner@google.com> | 2011-11-30 12:10:40 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-30 12:10:40 -0800 |
| commit | e1ea7f8384757f9b46805df75a0aa72c1fc041b7 (patch) | |
| tree | 3f19575ec31b0bbe994243a8fc0825baf47dd1f6 /Source/WebKit/android | |
| parent | 797c8d1884320bf1f1c034a8ab96fdacde0eb101 (diff) | |
| parent | 1adc38d53cef911069a0d08a4049f5be6ea50a93 (diff) | |
| download | external_webkit-e1ea7f8384757f9b46805df75a0aa72c1fc041b7.zip external_webkit-e1ea7f8384757f9b46805df75a0aa72c1fc041b7.tar.gz external_webkit-e1ea7f8384757f9b46805df75a0aa72c1fc041b7.tar.bz2 | |
Merge "DO NOT MERGE Use unsigned length when reading data" into ics-mr1
Diffstat (limited to 'Source/WebKit/android')
| -rw-r--r-- | Source/WebKit/android/jni/WebHistory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WebKit/android/jni/WebHistory.cpp b/Source/WebKit/android/jni/WebHistory.cpp index 7ec73a3..aa74b81 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; + unsigned l; memcpy(&l, data, sizeofUnsigned); // Increment data pointer by the size of an unsigned int. data += sizeofUnsigned; |