Vitaliy Margolen : dinput: Add buffer overflow check.
Alexandre Julliard
julliard at winehq.org
Mon Oct 17 13:08:53 CDT 2011
Module: wine
Branch: master
Commit: db6780806e939f3b31504243aedc4392fb5dad41
URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6780806e939f3b31504243aedc4392fb5dad41
Author: Vitaliy Margolen <wine-patches at kievinfo.com>
Date: Sun Oct 16 12:36:46 2011 -0600
dinput: Add buffer overflow check.
---
dlls/dinput/tests/mouse.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c
index db96a15..0d6b88a 100644
--- a/dlls/dinput/tests/mouse.c
+++ b/dlls/dinput/tests/mouse.c
@@ -75,6 +75,7 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd)
DIPROPDWORD di_op;
DIDEVICEOBJECTDATA mouse_state;
DWORD cnt;
+ int i;
if (! SetForegroundWindow(hwnd))
{
@@ -90,7 +91,7 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd)
ok(hr == S_OK, "SetCooperativeLevel: %08x\n", hr);
memset(&di_op, 0, sizeof(di_op));
- di_op.dwData = 20;
+ di_op.dwData = 5;
di_op.diph.dwHow = DIPH_DEVICE;
di_op.diph.dwSize = sizeof(DIPROPDWORD);
di_op.diph.dwHeaderSize = sizeof(DIPROPHEADER);
@@ -143,6 +144,17 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd)
hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0);
ok(hr == S_OK && cnt > 0, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt);
+ /* Check for buffer owerflow */
+ for (i = 0; i < 6; i++)
+ mouse_event(MOUSEEVENTF_MOVE, 10 + i, 10 + i, 0, 0);
+
+ cnt = 1;
+ hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0);
+ ok(hr == DI_OK, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt);
+ cnt = 1;
+ hr = IDirectInputDevice_GetDeviceData(pMouse, sizeof(mouse_state), &mouse_state, &cnt, 0);
+ ok(hr == DI_OK && cnt == 1, "GetDeviceData() failed: %08x cnt:%d\n", hr, cnt);
+
if (pMouse) IUnknown_Release(pMouse);
DestroyWindow( hwnd2 );
More information about the wine-cvs
mailing list