commit 382038750c33eb57ef2d6dfba70d33354a697cd6
author Keith Mok <keithmok@google.com> Tue Oct 04 05:00:43 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 04 05:00:43 2022 +0000
tree b389082557b2953f79f0b116b0ef207ea1331d97
parent 903764749565739fbab458382758762af4a8c130
parent 33e883b7debe2c72df797d3ef6398f09bf185f77

Fix OOB crash for registerLocaleList am: a826540766 am: 215b93c38f am: f5624d3ae3 am: d3a71cd81a am: 13bd99317e am: 60be274f30 am: f017e92a96 am: 33e883b7de

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/minikin/+/20100213

Change-Id: I1e06314cd261d32446690570613c4f6ca0e59c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/minikin/LocaleListCache.cpp

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