Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d51bfc9b authored by Doug Zongker's avatar Doug Zongker Committed by Gerrit Code Review
Browse files

Merge "Fix the potential segmentation fault"

parents ec838b88 93ffa757

recovery.cpp

+7 −1
Original line number Diff line number Diff line
@@ -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);