Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd60eb9 authored by Michael Wright's avatar Michael Wright
Browse files

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
parent 8b452b87

libutils/Unicode.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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--;

    }