diff options
| author | Keith Mok <keithmok@google.com> | 2022-10-04 02:59:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-04 02:59:10 +0000 |
| commit | 60be274f3088f3ac797af08bcccee66904064ae4 (patch) | |
| tree | 05e41f8164dc05fc94dd032e50c3c82caee90483 | |
| parent | aa6c2c7aaa7974a53b0ed6525753501130c426eb (diff) | |
| parent | 13bd99317e499869aa56da74906f028157b0d1b5 (diff) | |
| download | minikin-60be274f3088f3ac797af08bcccee66904064ae4.tar.gz | |
Fix OOB crash for registerLocaleList am: a826540766 am: 215b93c38f am: f5624d3ae3 am: d3a71cd81a am: 13bd99317e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/20100213
Change-Id: Ia20e44ba396b19846d9310ece3b3a7112ba0122c
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 0baee05..acda312 100644 --- a/libs/minikin/LocaleListCache.cpp +++ b/libs/minikin/LocaleListCache.cpp @@ -63,7 +63,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'; |