commit 90877b2534824ca0494f17796a897791115e709c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:33:59 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed May 10 16:33:59 2023 +0000
tree e1c145405a0db9e24bbb7386fe765aab97c3328d
parent 47437fbce536511c164aca117dc4c71f4c768255
parent 36c1161394b5326928858d2db709ba7ef6759932

Snap for 10103804 from 36c1161394b5326928858d2db709ba7ef6759932 to mainline-tzdata5-release

Change-Id: Ife517a13db3dc97d011e3da2ec5c64708f710b76

libteeui/include/teeui/utf8range.h

diff --git a/libteeui/include/teeui/utf8range.h b/libteeui/include/teeui/utf8range.h
index 496b903..5fe27ff 100644
--- a/libteeui/include/teeui/utf8range.h
+++ b/libteeui/include/teeui/utf8range.h
@@ -61,7 +61,7 @@
             return c;
         } else {
             // multi byte
-            unsigned long result = c & ~(0xff << (8 - byte_count));
+            unsigned long result = c & ~(0xffu << (8 - byte_count));
             ++begin;
             for (size_t i = 1; i < byte_count; ++i) {
                 result <<= 6;

libteeui/src/label.cpp

diff --git a/libteeui/src/label.cpp b/libteeui/src/label.cpp
index 5e0cc26..6dfd8f7 100644
--- a/libteeui/src/label.cpp
+++ b/libteeui/src/label.cpp
@@ -69,7 +69,11 @@
 
     auto curLine = lineInfo->begin();
     while (textBegin != text_.end()) {
-        if (curLine == lineInfo->end()) return Error::OutOfMemory;
+        if (curLine == lineInfo->end()) {
+            TEEUI_LOG << "lineInfo filled: lines=" << lineInfo->size_ << " textId=" << textId_
+                      << ENDL;
+            return Error::OutOfMemory;
+        }
 
         auto lineEnd = textBegin;