diff options
author | Doug Zongker <dougz@android.com> | 2013-06-04 12:10:28 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-04 12:10:28 -0700 |
commit | 8cd12112e444e01163526fe6ab237f6164b0018b (patch) | |
tree | c7223f8e8a1256dc0e3c27665138cd3c0d740c54 /recovery.cpp | |
parent | da1ebaef0aa8e38db6edf8bfc3d96290461a424f (diff) | |
parent | d51bfc9b1fe89321af3c629e7b23a747050332e1 (diff) | |
download | bootable_recovery-8cd12112e444e01163526fe6ab237f6164b0018b.zip bootable_recovery-8cd12112e444e01163526fe6ab237f6164b0018b.tar.gz bootable_recovery-8cd12112e444e01163526fe6ab237f6164b0018b.tar.bz2 |
am d51bfc9b: Merge "Fix the potential segmentation fault"
* commit 'd51bfc9b1fe89321af3c629e7b23a747050332e1':
Fix the potential segmentation fault
Diffstat (limited to 'recovery.cpp')
-rw-r--r-- | recovery.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp index 840e63c..c82844d 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -200,6 +200,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 @@ -207,7 +208,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); |