commit 9fb676aa924b2ad1c1f2f8f44734b1ecd9f909dc
author Doug Zongker <dougz@android.com> Mon Nov 18 17:58:12 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 18 17:58:12 2013 +0000
tree 8f5677df0275d500b60b8d0efbc814a5059186e5
parent 027429a34fd229d7546640bd5b629156da8dd0fd
parent 9b8ae8038be65c2ec236bc04590716fbcd5363f6

Merge "Fix rare crash seen when dereferencing backgroundIcon[NONE]."

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index 8376341..be7abca 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -376,6 +376,7 @@
     text_cols = gr_fb_width() / char_width;
     if (text_cols > kMaxCols - 1) text_cols = kMaxCols - 1;
 
+    backgroundIcon[NONE] = NULL;
     LoadBitmap("icon_installing", &backgroundIcon[INSTALLING_UPDATE]);
     backgroundIcon[ERASING] = backgroundIcon[INSTALLING_UPDATE];
     LoadBitmap("icon_error", &backgroundIcon[ERROR]);