From 65e6974494804ae3137b4f02641f17f5652542ab Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Wed, 13 Apr 2016 18:57:45 +0200 Subject: [PATCH] [makerom] Fix parsing of -content option --- makerom/user_settings.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/makerom/user_settings.c b/makerom/user_settings.c index f1a864e..6d19e05 100644 --- a/makerom/user_settings.c +++ b/makerom/user_settings.c @@ -614,7 +614,15 @@ int SetArgument(int argc, int i, char *argv[], user_settings *set) PrintArgReqParam(argv[i], 1); return USR_ARG_REQ_PARAM; } - char *pos = strstr(argv[i + 1], ":"); + int count = 0; + char *pos = argv[i + 1]; + while ((pos = strstr(pos + 1, ":"))) + count++; + + pos = argv[i + 1]; + while (count-- > 1) + pos = strstr(pos + 1, ":"); + if (!pos || strlen(pos) < 2) { fprintf(stderr, "[SETTING ERROR] Bad argument '%s %s', correct format:\n", argv[i], argv[i + 1]); fprintf(stderr, " %s :\n", argv[i]);