openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix strstr16. 

strcmp needs a limit, otherwise it will compare the null terminator
with the next character in the haystack, which results in the compare
failing for all searches except where the needle is found at the very
end.

Bug: 28663748
Change-Id: I1939dc4037c2f2a75d617943b063d2d38a8c5e3a
This commit is contained in:
Michael Wright 2016-05-16 21:23:07 +01:00
parent 8b452b876b
commit 0fd60eb9b4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libutils/Unicode.cpp
View File

@ -292,6 +292,7 @@ size_t strnlen16(const char16_t *s, size_t maxlen)
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 @@ char16_t* strstr16(const char16_t* src, const char16_t* target)
return nullptr;
}
} while (*src++ != needle);
} while (strcmp16(src, target) != 0);
} while (strncmp16(src, target, target_len) != 0);
src--;
}