PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8e9c6801: recovery: Fix the bug that truncates menu entries.

Browse Source 
* commit '8e9c68019f9c284b89155c71922ad8ac84af6ab6':
  recovery: Fix the bug that truncates menu entries.
This commit is contained in:
Tao Bao
2015-09-03 17:21:02 +00:00
committed by Android Git Automerger
parent ceb81e4931 8e9c68019f
commit 834c92b7b1
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wear_ui.cpp
+6 -1
View File
@@ -482,7 +482,12 @@ void WearRecoveryUI::StartMenu(const char* const * headers, const char* const *
if (text_rows > 0 && text_cols > 0) { if (text_rows > 0 && text_cols > 0) {
menu_headers_ = headers; menu_headers_ = headers;
size_t i = 0; size_t i = 0;
for (; i < text_rows && items[i] != nullptr; i++) { // "i < text_rows" is removed from the loop termination condition,
// which is different from the one in ScreenRecoveryUI::StartMenu().
// Because WearRecoveryUI supports scrollable menu, it's fine to have
// more entries than text_rows. The menu may be truncated otherwise.
// Bug: 23752519
for (; items[i] != nullptr; i++) {
strncpy(menu[i], items[i], text_cols - 1); strncpy(menu[i], items[i], text_cols - 1);
menu[i][text_cols - 1] = '\0'; menu[i][text_cols - 1] = '\0';
} }