diff options
| author | Keith Mok <keithmok@google.com> | 2022-10-04 00:14:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-04 00:14:06 +0000 |
| commit | 215b93c38f9d871cf1675c1dc156126ac604e0b7 (patch) | |
| tree | 5cf6c3f529a27282e651796711771108f99bbdc0 | |
| parent | 4658663d14d997a8a06cc6e4c6f7ea52879caccd (diff) | |
| parent | a8265407660edaa1006545a6401d6409c05acb5d (diff) | |
| download | minikin-215b93c38f9d871cf1675c1dc156126ac604e0b7.tar.gz | |
Fix OOB crash for registerLocaleList am: a826540766
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/20100213
Change-Id: Ic106f287fe4d0960242a7faa12bd8d25c13b6ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/minikin/LocaleListCache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/minikin/LocaleListCache.cpp b/libs/minikin/LocaleListCache.cpp index 5bd869e..ec47145 100644 --- a/libs/minikin/LocaleListCache.cpp +++ b/libs/minikin/LocaleListCache.cpp @@ -59,7 +59,7 @@ static size_t toLanguageTag(char* output, size_t outSize, const StringPiece& loc char likelyChars[ULOC_FULLNAME_CAPACITY]; uErr = U_ZERO_ERROR; uloc_addLikelySubtags(output, likelyChars, ULOC_FULLNAME_CAPACITY, &uErr); - if (U_FAILURE(uErr)) { + if (U_FAILURE(uErr) || (uErr == U_STRING_NOT_TERMINATED_WARNING)) { // unable to build a proper locale identifier ALOGD("uloc_addLikelySubtags(\"%s\") failed: %s", output, u_errorName(uErr)); output[0] = '\0'; |