reg: Fail if the data argument for REG_DWORD begins with a minus sign.

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

reg: Fail if the data argument for REG_DWORD begins with a minus sign.
474361ec · Hugh McMaster · Alexandre Julliard · 948888b9 · 474361ec · 474361ec
Commit 474361ec authored Feb 16, 2016 by Hugh McMaster Committed by Alexandre Julliard Feb 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

reg.c programs/reg/reg.c +1 -1

reg.c programs/reg/tests/reg.c +2 -2

No files found.
--- a/programs/reg/reg.c
+++ b/programs/reg/reg.c
@@ -244,7 +244,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r
            LPWSTR rest;
            DWORD val;
            val = strtoulW(data, &rest, 0);
-            if (*rest) {
+            if (*rest || data[0] == '-') {
                output_message(STRING_MISSING_INTEGER);
                break;
            }

--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -284,9 +284,9 @@ static void test_add(void)
    verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), 0);

    run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r);
-    todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r);
+    ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r);
    run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r);
-    todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r);
+    ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r);

    run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r);
    todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r);