[PATCH 1/3] reg: Abort 'add' operation when parsing command-line arguments that are not switches
Hugh McMaster
hugh.mcmaster at outlook.com
Fri Apr 2 06:26:53 CDT 2021
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/reg/add.c | 74 ++++++++++++++++++++++++----------------------
1 file changed, 38 insertions(+), 36 deletions(-)
diff --git a/programs/reg/add.c b/programs/reg/add.c
index e1fd2223716..f259f0a4100 100644
--- a/programs/reg/add.c
+++ b/programs/reg/add.c
@@ -222,46 +222,48 @@ int reg_add(int argc, WCHAR *argvW[])
for (i = 3; i < argc; i++)
{
- if (argvW[i][0] == '/' || argvW[i][0] == '-')
+ WCHAR *str;
+
+ if (argvW[i][0] != '/' && argvW[i][0] != '-')
+ goto invalid;
+
+ str = &argvW[i][1];
+
+ if (!lstrcmpiW(str, L"ve"))
{
- WCHAR *str = &argvW[i][1];
+ if (value_empty) goto invalid;
+ value_empty = TRUE;
+ continue;
+ }
+ else if (!str[0] || str[1])
+ goto invalid;
- if (!lstrcmpiW(str, L"ve"))
- {
- if (value_empty) goto invalid;
- value_empty = TRUE;
- continue;
- }
- else if (!str[0] || str[1])
+ switch (towlower(*str))
+ {
+ case 'v':
+ if (value_name || !(value_name = argvW[++i]))
goto invalid;
-
- switch (towlower(*str))
- {
- case 'v':
- if (value_name || !(value_name = argvW[++i]))
- goto invalid;
- break;
- case 't':
- if (type || !(type = argvW[++i]))
- goto invalid;
- break;
- case 'd':
- if (data || !(data = argvW[++i]))
- goto invalid;
- break;
- case 's':
- str = argvW[++i];
- if (separator || !str || lstrlenW(str) != 1)
- goto invalid;
- separator = str[0];
- break;
- case 'f':
- if (force) goto invalid;
- force = TRUE;
- break;
- default:
+ break;
+ case 't':
+ if (type || !(type = argvW[++i]))
goto invalid;
- }
+ break;
+ case 'd':
+ if (data || !(data = argvW[++i]))
+ goto invalid;
+ break;
+ case 's':
+ str = argvW[++i];
+ if (separator || !str || lstrlenW(str) != 1)
+ goto invalid;
+ separator = str[0];
+ break;
+ case 'f':
+ if (force) goto invalid;
+ force = TRUE;
+ break;
+ default:
+ goto invalid;
}
}
--
2.31.0
More information about the wine-devel
mailing list