commit d51bfc9b1fe89321af3c629e7b23a747050332e1
author Doug Zongker <dougz@android.com> Tue Jun 04 19:05:58 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 04 19:05:59 2013 +0000
tree 947b893bed823941f5a7fb5368d892d30bcef135
parent ec838b885dd8b74b8682dd2498c7da8f7afca291
parent 93ffa7579cd75d1bdb2d124aa5cc5f8b6025e3d8

Merge "Fix the potential segmentation fault"

recovery.cpp

diff --git a/recovery.cpp b/recovery.cpp
index 92aa503..2541e54 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -198,6 +198,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
@@ -205,7 +206,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);