reg: Abort 'query' operation when parsing command-line arguments that are not switches.

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

reg: Abort 'query' operation when parsing command-line arguments that are not switches.
2c7d7459 · Hugh McMaster · Alexandre Julliard · 51e83dec · 2c7d7459
Commit 2c7d7459 authored Apr 02, 2021 by Hugh McMaster Committed by Alexandre Julliard Apr 02, 2021
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

query.c programs/reg/query.c +6 -4

No files found.
--- a/programs/reg/query.c
+++ b/programs/reg/query.c
@@ -334,9 +334,12 @@ int reg_query(int argc, WCHAR *argvW[])

    for (i = 3; i < argc; i++)
    {
-        if (argvW[i][0] == '/' || argvW[i][0] == '-')
-        {
-            WCHAR *str = &argvW[i][1];
+        WCHAR *str;
+
+        if (argvW[i][0] != '/' && argvW[i][0] != '-')
+            goto invalid;
+
+        str = &argvW[i][1];

        if (!lstrcmpiW(str, L"ve"))
        {
@@ -361,7 +364,6 @@ int reg_query(int argc, WCHAR *argvW[])
            goto invalid;
        }
    }
-    }

    if (value_name && value_empty)
        goto invalid;