commit 5f2563c05dc0f265e502bcea60e0f122c9695342
author Michael Wright <michaelwr@google.com> Tue May 17 17:18:48 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 17 17:18:49 2016 +0000
tree b82f7ef93087b9ae3d79dbe2ed1393098b5d2fbc
parent f29876797e1efc2c9202f47a60ca23c5dbe6398f
parent 60d68715581bb597dfbc32e1fabdb1cab36c592c

Merge "Fix strstr16." into nyc-dev

libutils/Unicode.cpp

diff --git a/libutils/Unicode.cpp b/libutils/Unicode.cpp
index ade896a..f1f8bc9 100644
--- a/libutils/Unicode.cpp
+++ b/libutils/Unicode.cpp
@@ -292,6 +292,7 @@
 char16_t* strstr16(const char16_t* src, const char16_t* target)
 {
     const char16_t needle = *target++;
+    const size_t target_len = strlen16(target);
     if (needle != '\0') {
       do {
         do {
@@ -299,7 +300,7 @@
             return nullptr;
           }
         } while (*src++ != needle);
-      } while (strcmp16(src, target) != 0);
+      } while (strncmp16(src, target, target_len) != 0);
       src--;
     }