Fix the potential segmentation fault
Extral newline can trigger recovery segmentation fault Test case: host$ adb shell 'echo -en "--update_package=ota_update.zip\n--show_text\n\n" > /cache/recovery/command' host$ adb reboot recovery Change-Id: If1781c1f5ad94a273f1cb122b67cedd9fb562433 Signed-off-by: Jin Feng <jin88.feng@gmail.com>
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user