marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dinput: Check array indexes to avoid exceeding array bounds.

oldstable
Ken Thomases 2014-04-13 18:34:19 -05:00 committed by Alexandre Julliard
parent ab872f2f36
commit 2d809218a9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/dinput/joystick_osx.c
View File

@ -186,7 +186,7 @@ static IOHIDDeviceRef get_device_ref(int id)
IOHIDElementRef device_main_element;
IOHIDDeviceRef hid_device;
if (!device_main_elements)
if (!device_main_elements || id >= CFArrayGetCount(device_main_elements))
return 0;
device_main_element = (IOHIDElementRef)CFArrayGetValueAtIndex(device_main_elements, id);
@ -325,8 +325,6 @@ static void get_element_children(IOHIDElementRef element, CFMutableArrayRef all_
CFArrayRef element_children = IOHIDElementGetChildren(element);
cnt = CFArrayGetCount(element_children);
if (cnt < 1)
return;
/* Either add the element to the array or grab its children */
for (idx=0; idx<cnt; idx++)
@ -454,7 +452,7 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8])
device->elements = NULL;
if (!device_main_elements)
if (!device_main_elements || device->id >= CFArrayGetCount(device_main_elements))
return;
device_main_element = (IOHIDElementRef)CFArrayGetValueAtIndex(device_main_elements, device->id);
@ -585,7 +583,7 @@ static void poll_osx_device_state(LPDIRECTINPUTDEVICE8A iface)
TRACE("polling device %i\n",device->id);
if (!device_main_elements)
if (!device_main_elements || device->id >= CFArrayGetCount(device_main_elements))
return;
device_main_element = (IOHIDElementRef) CFArrayGetValueAtIndex(device_main_elements, device->id);