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

Commit 9eadc51f authored by that's avatar that
Browse files

bootloader: fix crash with empty lines in /cache/recovery/command 

original fix from commit 93ffa757
copied to our code.

Also fixed a whitespace issue in the same code block.

Change-Id: I6396803659c6880cde4f2b2ef08efab5721c215d
parent 0e9dec87

bootloader.cpp

+9 −3
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ get_args(int *argc, char ***argv) { 
    if (*argc <= 1) {

        FILE *fp = fopen(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
@@ -396,7 +397,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;

                }

            }



            fflush(fp);