advapi32: Improve parameter sanity checks in RegLoadMUIString.

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

advapi32: Improve parameter sanity checks in RegLoadMUIString.
ec716f74 · Akihiro Sagawa · Alexandre Julliard · 1b7f3698 · ec716f74 · ec716f74
Commit ec716f74 authored May 09, 2019 by Akihiro Sagawa Committed by Alexandre Julliard May 13, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

registry.c dlls/advapi32/registry.c +1 -1

registry.c dlls/advapi32/tests/registry.c +2 -2

No files found.
--- a/dlls/advapi32/registry.c
+++ b/dlls/advapi32/registry.c
@@ -3183,7 +3183,7 @@ LSTATUS WINAPI RegLoadMUIStringW(HKEY hKey, LPCWSTR pwszValue, LPWSTR pwszBuffer
          cbBuffer, pcbData, dwFlags, debugstr_w(pwszBaseDir));

    /* Parameter sanity checks. */
-    if (!hKey || !pwszBuffer)
+    if (!hKey || (!pwszBuffer && cbBuffer) || (cbBuffer % sizeof(WCHAR)))
        return ERROR_INVALID_PARAMETER;

    /* Check for value existence and correctness of its type, allocate a buffer and load it. */

--- a/dlls/advapi32/tests/registry.c
+++ b/dlls/advapi32/tests/registry.c
@@ -3896,8 +3896,8 @@ static void test_RegLoadMUIString(void)

    memset(bufW, 0xff, sizeof(bufW));
    ret = pRegLoadMUIStringW(hkey, tz_valueW, bufW, sizeof(WCHAR)+1, &size, 0, NULL);
-    todo_wine ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret);
-    todo_wine ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]);
+    ok(ret == ERROR_INVALID_PARAMETER, "got %d, expected ERROR_INVALID_PARAMETER\n", ret);
+    ok(bufW[0] == 0xffff, "got 0x%04x, expected 0xffff\n", bufW[0]);

    size = 0xdeadbeef;
    memset(bufW, 0xff, sizeof(bufW));