We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch #4: add an extra CFRelease, on device-disconnect

SDL_bug_4961_fix-4.patch (text/plain), 2.50 KB, created by David Ludwig on 2020-02-04 21:41:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Ludwig

Created: 2020-02-04 21:41:19 UTC

Size: 2.50 KB

patch

obsolete

># HG changeset patch
># User David Ludwig <dludwig@pobox.com>
># Date 1580425414 18000
>#      Thu Jan 30 18:03:34 2020 -0500
># Node ID f5e0d1c026f93032f8a2efa43c96b039dd1f3412
># Parent  26fa8708d147e1609f678676051944b97e1ff534
>FIX for SDL-4927: CFRetain+CFRelease a game controller's IOKit object
>
>This fixes a crash whereby SDL could crash on macOS/Darwin, if and when a
>USB game controller gets unplugged.  SDL was not retaining a reference
>to the controller's OS/IOKit-provided 'device object', and was capable
>of trying to use it, after a device was hot-unplugged.
>
>diff -r 26fa8708d147 -r f5e0d1c026f9 src/joystick/darwin/SDL_sysjoystick.c
>--- a/src/joystick/darwin/SDL_sysjoystick.c	Tue Feb 04 07:23:44 2020 -0800
>+++ b/src/joystick/darwin/SDL_sysjoystick.c	Thu Jan 30 18:03:34 2020 -0500
>@@ -128,6 +128,7 @@
>     if (removeDevice) {
>         if (removeDevice->deviceRef) {
>             IOHIDDeviceUnscheduleFromRunLoop(removeDevice->deviceRef, CFRunLoopGetCurrent(), SDL_JOYSTICK_RUNLOOP_MODE);
>+            CFRelease(removeDevice->deviceRef);
>             removeDevice->deviceRef = NULL;
>         }
> 
>@@ -206,7 +207,11 @@
> {
>     recDevice *device = (recDevice *) ctx;
>     device->removed = SDL_TRUE;
>-    device->deviceRef = NULL; // deviceRef was invalidated due to the remove
>+    if (device->deviceRef) {
>+        // deviceRef was invalidated due to the remove
>+        CFRelease(device->deviceRef);
>+        device->deviceRef = NULL;
>+    }
>     if (device->ffeffect_ref) {
>         FFDeviceReleaseEffect(device->ffdevice, device->ffeffect_ref);
>         device->ffeffect_ref = NULL;
>@@ -428,6 +433,15 @@
>         return SDL_FALSE; /* Filter device list to non-keyboard/mouse stuff */
>     }
> 
>+    /* Make sure we retain the use of the IOKit-provided device-object,
>+       lest the device get disconnected and we try to use it.  (Fixes
>+       SDL-Bugzilla #4961, aka. https://bugzilla.libsdl.org/show_bug.cgi?id=4961 )
>+    */
>+    CFRetain(hidDevice);
>+
>+    /* Now that we've CFRetain'ed the device-object (for our use), we'll
>+       save the reference to it.
>+    */
>     pDevice->deviceRef = hidDevice;
> 
>     refCF = IOHIDDeviceGetProperty(hidDevice, CFSTR(kIOHIDVendorIDKey));
>@@ -546,12 +560,12 @@
>     }
> 
>     if (!GetDeviceInfo(ioHIDDeviceObject, device)) {
>-        SDL_free(device);
>+        FreeDevice(device);
>         return;   /* not a device we care about, probably. */
>     }
> 
>     if (SDL_ShouldIgnoreJoystick(device->product, device->guid)) {
>-        SDL_free(device);
>+        FreeDevice(device);
>         return;
>     }
>

Actions: View | Diff

Attachments on bug 4961: 4179 | 4182 | 4184 | 4190

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.