From 2d809218a9052aae3f2d3c63be532da7c58eb581 Mon Sep 17 00:00:00 2001
From: Ken Thomases <ken@codeweavers.com>
Date: Sun, 13 Apr 2014 18:34:19 -0500
Subject: [PATCH] dinput: Check array indexes to avoid exceeding array bounds.

---
 dlls/dinput/joystick_osx.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c
index a98c1eae139..69d8bd658ab 100644
--- a/dlls/dinput/joystick_osx.c
+++ b/dlls/dinput/joystick_osx.c
@@ -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);
-- 
2.11.4.GIT