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

Commit 8cd12112 authored by Doug Zongker's avatar Doug Zongker Committed by Android Git Automerger
Browse files

am d51bfc9b: Merge "Fix the potential segmentation fault" 

* commit 'd51bfc9b':
  Fix the potential segmentation fault
parents da1ebaef d51bfc9b

recovery.cpp

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