summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recovery.cpp8
-rw-r--r--screen_ui.cpp4
2 files changed, 11 insertions, 1 deletions
diff --git a/recovery.cpp b/recovery.cpp
index 840e63c42..c82844d25 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);
diff --git a/screen_ui.cpp b/screen_ui.cpp
index 222de00ee..93e260936 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -82,6 +82,10 @@ ScreenRecoveryUI::ScreenRecoveryUI() :
install_overlay_offset_y(190),
overlay_offset_x(-1),
overlay_offset_y(-1) {
+
+ for (int i = 0; i < 5; i++)
+ backgroundIcon[i] = NULL;
+
pthread_mutex_init(&updateMutex, NULL);
self = this;
}