summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2013-06-04 21:05:58 +0200
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-06-04 21:05:59 +0200
commitd51bfc9b1fe89321af3c629e7b23a747050332e1 (patch)
tree947b893bed823941f5a7fb5368d892d30bcef135
parentMerge "minadbd: remove unnecessary header files." (diff)
parentFix the potential segmentation fault (diff)
downloadandroid_bootable_recovery-d51bfc9b1fe89321af3c629e7b23a747050332e1.tar
android_bootable_recovery-d51bfc9b1fe89321af3c629e7b23a747050332e1.tar.gz
android_bootable_recovery-d51bfc9b1fe89321af3c629e7b23a747050332e1.tar.bz2
android_bootable_recovery-d51bfc9b1fe89321af3c629e7b23a747050332e1.tar.lz
android_bootable_recovery-d51bfc9b1fe89321af3c629e7b23a747050332e1.tar.xz
android_bootable_recovery-d51bfc9b1fe89321af3c629e7b23a747050332e1.tar.zst
android_bootable_recovery-d51bfc9b1fe89321af3c629e7b23a747050332e1.zip
-rw-r--r--recovery.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 92aa50372..2541e54d8 100644
--- a/recovery.cpp
+++ b/recovery.cpp
@@ -198,6 +198,7 @@ get_args(int *argc, char ***argv) {
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 @@ get_args(int *argc, char ***argv) {
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);