commit a48aef4234768ed37828df613919391c21f561a7
author Vladimir Marko <vmarko@google.com> Wed Dec 03 17:53:53 2014 +0000
committer Vladimir Marko <vmarko@google.com> Wed Feb 11 10:02:55 2015 +0000
tree eb77858bc679512245336ec3ca96c8be59f6f34b
parent ccce1c02b162b667139eaef563460b1e1f330891

Fix ImageWriter::ComputeEagerResolvedStringsCallback().

Change-Id: I1a2abd6d78dd7067d9bdbadbd81dd2fd7711fbc5

runtime/dex_file.cc

diff --git a/runtime/dex_file.cc b/runtime/dex_file.cc
index 3d4184b..4f36c64 100644
--- a/runtime/dex_file.cc
+++ b/runtime/dex_file.cc
@@ -569,14 +569,14 @@
   return NULL;
 }
 
-const DexFile::StringId* DexFile::FindStringId(const uint16_t* string) const {
+const DexFile::StringId* DexFile::FindStringId(const uint16_t* string, size_t length) const {
   int32_t lo = 0;
   int32_t hi = NumStringIds() - 1;
   while (hi >= lo) {
     int32_t mid = (hi + lo) / 2;
     const DexFile::StringId& str_id = GetStringId(mid);
     const char* str = GetStringData(str_id);
-    int compare = CompareModifiedUtf8ToUtf16AsCodePointValues(str, string);
+    int compare = CompareModifiedUtf8ToUtf16AsCodePointValues(str, string, length);
     if (compare > 0) {
       lo = mid + 1;
     } else if (compare < 0) {