From 46bdc153f129a32bd88eefc484d27db3e89ac881 Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Wed, 17 Feb 2016 23:41:05 +1100 Subject: [PATCH] reg: Fail if /s is used without an accompanying argument. Signed-off-by: Hugh McMaster Signed-off-by: Alexandre Julliard --- programs/reg/reg.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ef25fe50a3..bcd812abd8 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -576,7 +576,16 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashTW)) type = argvW[++i]; else if (!lstrcmpiW(argvW[i], slashSW)) - separator = argvW[++i][0]; + { + WCHAR *ptr = argvW[++i]; + + if (!ptr) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + separator = ptr[0]; + } else if (!lstrcmpiW(argvW[i], slashDW)) { if (!(data = argvW[++i]))