xinput: Check for NULL argument in XInputGetState.

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

xinput: Check for NULL argument in XInputGetState.
b84a4aa5 · Andrew Eikum · Alexandre Julliard · b03a4b89 · b84a4aa5 · b84a4aa5
Commit b84a4aa5 authored Sep 30, 2019 by Andrew Eikum Committed by Alexandre Julliard Sep 30, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

xinput.c dlls/xinput1_3/tests/xinput.c +3 -0

xinput_main.c dlls/xinput1_3/xinput_main.c +3 -0

No files found.
--- a/dlls/xinput1_3/tests/xinput.c
+++ b/dlls/xinput1_3/tests/xinput.c
@@ -126,6 +126,9 @@ static void test_get_state(void)
        }
    }

+    result = pXInputGetState(0, NULL);
+    ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result);
+
    result = pXInputGetState(XUSER_MAX_COUNT, &state);
    ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result);


--- a/dlls/xinput1_3/xinput_main.c
+++ b/dlls/xinput1_3/xinput_main.c
@@ -88,6 +88,9 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION* vib
 * XInputGetState() in the hook, so we need a wrapper. */
 static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state)
 {
+    if (!state)
+        return ERROR_BAD_ARGUMENTS;
+
    HID_find_gamepads(controllers);

    if (index >= XUSER_MAX_COUNT)