[prev in list] [next in list] [prev in thread] [next in thread]
List: wine-devel
Subject: [PATCH] xinput: Check for NULL argument in XInputGetState
From: Andrew Eikum <aeikum () codeweavers ! com>
Date: 2019-09-30 18:04:26
Message-ID: 20190930180426.zqh5qq5lyezrrvml () foghorn ! codeweavers ! com
[Download RAW message or body]
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
---
dlls/xinput1_3/tests/xinput.c | 3 +++
dlls/xinput1_3/xinput_main.c | 3 +++
2 files changed, 6 insertions(+)
diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c
index e5eb504d522..a6e2107446c 100644
--- 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);
diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c
index 57337e09ad9..a417fec7ad1 100644
--- 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)
--
2.23.0
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic