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

Commit aa7b0312 authored by Michael Wright's avatar Michael Wright Committed by android-build-merger
Browse files

Merge "Fix strstr16." into nyc-dev am: a34a3836 

am: a12fb416

* commit 'a12fb416':
  Fix strstr16.

Change-Id: I6776ce521daf4b45f22c55dbee714f2abe8c599e
parents 8d6aad11 a12fb416

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--;

    }