commit 36c1161394b5326928858d2db709ba7ef6759932
author Mike McTernan <mikemcternan@google.com> Fri Apr 14 19:23:55 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 14 19:23:55 2023 +0000
tree e1c145405a0db9e24bbb7386fe765aab97c3328d
parent 51d0bc9504a6f7a47910fcd82da980ef76a06fb2
parent 4d2e02e14c3b238771791e1b19e6a725ad45affc

trusty:teeui: Add error message to help track down 'out of memory' errors. am: be41cb2966 am: 521f75cc08 am: d5d12308a0 am: 4d2e02e14c

Original change: https://android-review.googlesource.com/c/platform/system/teeui/+/2537970

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

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;