commit 51ffaf54a56441bba053d37a00122761c3a18f16
author The Android Open Source Project <initial-contribution@android.com> Thu Jul 11 08:22:20 2013 -0700
committer The Android Open Source Project <initial-contribution@android.com> Thu Jul 11 08:22:20 2013 -0700
tree 09b93388c4ea0bfaf87e41128f4fac238e02773f
parent fbcfad33face5d3b9e6b8cb04379168bceb517df
parent 166565f9fb3034f7e7f60f6614cff754d94a4078

Reconcile with jb-mr2-release - do not merge

Change-Id: Id35004f465f5152c1de0796eb66989f234185208

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 840e63c..c82844d 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -200,6 +200,7 @@
     if (*argc <= 1) {
         FILE *fp = fopen_path(COMMAND_FILE, "r");
         if (fp != NULL) {
+            char *token;
             char *argv0 = (*argv)[0];
             *argv = (char **) malloc(sizeof(char *) * MAX_ARGS);
             (*argv)[0] = argv0;  // use the same program name
@@ -207,7 +208,12 @@
             char buf[MAX_ARG_LENGTH];
             for (*argc = 1; *argc < MAX_ARGS; ++*argc) {
                 if (!fgets(buf, sizeof(buf), fp)) break;
-                (*argv)[*argc] = strdup(strtok(buf, "\r\n"));  // Strip newline.
+                token = strtok(buf, "\r\n");
+                if (token != NULL) {
+                    (*argv)[*argc] = strdup(token);  // Strip newline.
+                } else {
+                    --*argc;
+                }
             }
 
             check_and_fclose(fp, COMMAND_FILE);

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index 222de00..93e2609 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -82,6 +82,10 @@
     install_overlay_offset_y(190),
     overlay_offset_x(-1),
     overlay_offset_y(-1) {
+
+    for (int i = 0; i < 5; i++)
+        backgroundIcon[i] = NULL;
+
     pthread_mutex_init(&updateMutex, NULL);
     self = this;
 }