eden-emu/SDL
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Explicitly retain and release NSObjects in C structures

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/9021
Fixes https://github.com/libsdl-org/SDL/issues/9042
This commit is contained in:
Sam Lantinga 2024-02-12 10:20:06 -08:00
parent 87c07a79c0
commit 42cdbf6b21
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/joystick/apple/SDL_mfijoystick.m
View file

@ -498,7 +498,7 @@ static BOOL IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
NSDictionary<NSString *, GCControllerElement *> *elements = controller.physicalInputProfile.elements; NSDictionary<NSString *, GCControllerElement *> *elements = controller.physicalInputProfile.elements;
/* Provide both axes and analog buttons as SDL axes */ /* Provide both axes and analog buttons as SDL axes */
device->axes = [[[elements allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)] NSArray *axes = [[[elements allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]
filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id object, NSDictionary *bindings) { filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id object, NSDictionary *bindings) {
if (ElementAlreadyHandled(device, (NSString *)object, elements)) { if (ElementAlreadyHandled(device, (NSString *)object, elements)) {
return NO; return NO;
@ -513,8 +513,7 @@ static BOOL IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
} }
return NO; return NO;
}]]; }]];
device->naxes = (int)device->axes.count; NSArray *buttons = [[[elements allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]
device->buttons = [[[elements allKeys] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]
filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id object, NSDictionary *bindings) { filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id object, NSDictionary *bindings) {
if (ElementAlreadyHandled(device, (NSString *)object, elements)) { if (ElementAlreadyHandled(device, (NSString *)object, elements)) {
return NO; return NO;
@ -526,7 +525,12 @@ static BOOL IOS_AddMFIJoystickDevice(SDL_JoystickDeviceItem *device, GCControlle
} }
return NO; return NO;
}]]; }]];
device->nbuttons = (int)device->buttons.count; /* Explicitly retain the arrays because SDL_JoystickDeviceItem is a
* struct, and ARC doesn't work with structs. */
device->naxes = (int)axes.count;
device->axes = (__bridge NSArray *)CFBridgingRetain(axes);
device->nbuttons = (int)buttons.count;
device->buttons = (__bridge NSArray *)CFBridgingRetain(buttons);
subtype = 4; subtype = 4;
#ifdef DEBUG_CONTROLLER_PROFILE #ifdef DEBUG_CONTROLLER_PROFILE
@ -750,13 +754,20 @@ static SDL_JoystickDeviceItem *IOS_RemoveJoystickDevice(SDL_JoystickDeviceItem *
#ifdef SDL_JOYSTICK_MFI #ifdef SDL_JOYSTICK_MFI
@autoreleasepool { @autoreleasepool {
/* These were explicitly retained in the struct, so they should be explicitly released before freeing the struct. */
if (device->controller) { if (device->controller) {
/* The controller was explicitly retained in the struct, so it
* should be explicitly released before freeing the struct. */
GCController *controller = CFBridgingRelease((__bridge CFTypeRef)(device->controller)); GCController *controller = CFBridgingRelease((__bridge CFTypeRef)(device->controller));
controller.controllerPausedHandler = nil; controller.controllerPausedHandler = nil;
device->controller = nil; device->controller = nil;
} }
if (device->axes) {
NSArray *axes = CFBridgingRelease((__bridge CFTypeRef)(device->axes));
device->axes = nil;
}
if (device->buttons) {
NSArray *buttons = CFBridgingRelease((__bridge CFTypeRef)(device->buttons));
device->buttons = nil;
}
} }
#endif /* SDL_JOYSTICK_MFI */ #endif /* SDL_JOYSTICK_MFI */