Skip to content
This repository has been archived by the owner on Feb 26, 2020. It is now read-only.

Safety check to prevent crash on macOS when IOHIDManagerCopyDevices() returns NULL #1

Merged
merged 1 commit into from
Jul 10, 2018
Merged

Safety check to prevent crash on macOS when IOHIDManagerCopyDevices() returns NULL #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mac/hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ struct hid_device_info HID_API_EXPORT *hid_enumerate(unsigned short vendor_id,
/* Get a list of the Devices */
IOHIDManagerSetDeviceMatching(hid_mgr, NULL);
CFSetRef device_set = IOHIDManagerCopyDevices(hid_mgr);
if (device_set == NULL)
return NULL;

/* Convert the list into a C array so we can iterate easily. */
num_devices = CFSetGetCount(device_set);
Expand Down Expand Up @@ -1081,6 +1083,8 @@ int main(void)
IOHIDManagerOpen(mgr, kIOHIDOptionsTypeNone);

CFSetRef device_set = IOHIDManagerCopyDevices(mgr);
if (device_set == NULL)
return 0;

CFIndex num_devices = CFSetGetCount(device_set);
IOHIDDeviceRef *device_array = calloc(num_devices, sizeof(IOHIDDeviceRef));
Expand Down