CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-04 10:36:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Protect against failed pad init

Browse Source
This commit is contained in:
twinaphex 2015-05-06 04:03:00 +02:00
parent 1171cba2a4
commit f57132ff6f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/drivers_hid/iohidmanager_hid.c
View File

@ -303,7 +303,7 @@ static void iohidmanager_hid_device_add(void *data, IOReturn result,
ret = IOHIDDeviceOpen(device, kIOHIDOptionsTypeNone);
if (ret != kIOReturnSuccess)
goto error;
return;
/* Move the device's run loop to this thread. */
IOHIDDeviceScheduleWithRunLoop(device, CFRunLoopGetCurrent(),
@ -321,6 +321,9 @@ static void iohidmanager_hid_device_add(void *data, IOReturn result,
adapter->slot = pad_connection_pad_init(hid->slots,
adapter->name, dev_vid, dev_pid, adapter, &iohidmanager_hid_device_send_control);
if (adapter->slot == -1)
return;
if (pad_connection_has_interface(hid->slots, adapter->slot))
IOHIDDeviceRegisterInputReportCallback(device,
adapter->data + 1, sizeof(adapter->data) - 1,
@ -337,9 +340,6 @@ static void iohidmanager_hid_device_add(void *data, IOReturn result,
iohidmanager_hid_device_add_autodetect(adapter->slot,
adapter->name, iohidmanager_hid.ident, dev_vid, dev_pid);
error:
return;
}
static void iohidmanager_hid_append_matching_dictionary(CFMutableArrayRef array,
@ -431,6 +431,7 @@ static void *iohidmanager_hid_init(void)
hid_apple->slots = (joypad_connection_t*)pad_connection_init(MAX_USERS);
return hid_apple;
error:

3
input/drivers_hid/libusb_hid.c
View File

@ -253,6 +253,9 @@ static int add_adapter(void *data, struct libusb_device *dev)
adapter->slot = pad_connection_pad_init(hid->slots,
device_name, desc.idVendor, desc.idProduct, adapter, &libusb_hid_device_send_control);
if (adapter->slot == -1)
goto error;
if (!pad_connection_has_interface(hid->slots, adapter->slot))
{
fprintf(stderr, " Interface not found (%s).\n", adapter->name);