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
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 23 deletions

query.c programs/reg/query.c +25 -23

No files found.
--- a/programs/reg/query.c
+++ b/programs/reg/query.c
@@ -334,32 +334,34 @@ int reg_query(int argc, WCHAR *argvW[])
    for (i = 3; i < argc; i++)
    {
-        if (argvW[i][0] == '/' || argvW[i][0] == '-')
+        WCHAR *str;
-        {
-            WCHAR *str = &argvW[i][1];
-            if (!lstrcmpiW(str, L"ve"))
+        if (argvW[i][0] != '/' && argvW[i][0] != '-')
-            {
+            goto invalid;
-                if (value_empty) goto invalid;
-                value_empty = TRUE;
-                continue;
-            }
-            else if (!str[0] || str[1])
-                goto invalid;
-            switch (towlower(*str))
+        str = &argvW[i][1];
-            {
-            case 'v':
+        if (!lstrcmpiW(str, L"ve"))
-                if (value_name || !(value_name = argvW[++i]))
+        {
-                    goto invalid;
+            if (value_empty) goto invalid;
-                break;
+            value_empty = TRUE;
-            case 's':
+            continue;
-                if (recurse) goto invalid;
+        }
-                recurse = TRUE;
+        else if (!str[0] || str[1])
-                break;
+            goto invalid;
-            default:
+        switch (towlower(*str))
+        {
+        case 'v':
+            if (value_name || !(value_name = argvW[++i]))
                goto invalid;
-            }
+            break;
+        case 's':
+            if (recurse) goto invalid;
+            recurse = TRUE;
+            break;
+        default:
+            goto invalid;
        }
    }