RPCS3/hidapi
1
0
Fork 0
mirror of https://github.com/RPCS3/hidapi.git synced 2026-07-21 00:45:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved the cleanup of libusb transfer objects to hid_close(), and out of the

Browse Source 
read_thread().  This way the sequence of disconnecting the device and then
calling hid_close() will not cause a crash.
This commit is contained in:
Alan Ott
2010-12-21 13:24:26 -05:00
parent 02b5007fc4
commit afc41b7b1d
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linux/hid-libusb.c
+11 -3
View File
@@ -521,9 +521,13 @@ static void *read_thread(void *param)
libusb_handle_events(NULL);
}
/* Cleanup before returning */
free(dev->transfer->buffer);
libusb_free_transfer(dev->transfer);
/* The dev->transfer->buffer and dev->transfer objects are cleaned up
in hid_close(). They are not cleaned up here because this thread
could end either due to a disconnect or due to a user
call to hid_close(). In both cases the objects can be safely
cleaned up after the call to pthread_join() (in hid_close()), but
since hid_close() calls libusb_cancel_transfer(), on these objects,
they can not be cleaned up here. */
return NULL;
}
@@ -838,6 +842,10 @@ void HID_API_EXPORT hid_close(hid_device *dev)
/* Wait for read_thread() to end. */
pthread_join(dev->thread, NULL);
/* Clean up the Transfer objects allocated in read_thread(). */
free(dev->transfer->buffer);
libusb_free_transfer(dev->transfer);
/* release the interface */
libusb_release_interface(dev->device_handle, dev->interface);