mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-05 19:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

coreaudio: simplify memory leak fix.

Browse Source 
I _did_ appreciate the explanation, but it doesn't have to live in the
source code; also we can just release `devuid` and then check for error with
the usual macro, since SDL is done with it either way at this point.

(cherry picked from commit 17af09f3a9)
This commit is contained in:
Ryan C. Gordon
2024-06-15 11:42:44 -04:00
parent a9da8dd22d
commit 510f413bb8
1 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/audio/coreaudio/SDL_coreaudio.m
View File

@@ -806,35 +806,8 @@ static int assign_device_to_audioqueue(_THIS)
result = AudioObjectGetPropertyData(this->hidden->deviceID, &prop, 0, NULL, &devuidsize, &devuid);
CHECK_RESULT("AudioObjectGetPropertyData (kAudioDevicePropertyDeviceUID)");
result = AudioQueueSetProperty(this->hidden->audioQueue, kAudioQueueProperty_CurrentDevice, &devuid, devuidsize);
/*
If AudioObjectGetPropertyData succeeds and AudioQueueSetProperty fails,
calling CHECK_RESULT("AudioQueueSetProperty (kAudioQueueProperty_CurrentDevice)");
will cause a memory leak since it returns
*/
// !!! FIXME: do we need to CFRelease(devuid)
/* Yes
CFStringRef is passed to AudioObjectGetPropertyData as an argument of type
UnsafeMutableRawPointer. As stated in the Apple Developer Documentation,
"The UnsafeMutableRawPointer type provides no automated memory management,
no type safety, and no alignment guarantees. You are responsible for
handling the life cycle of any memory you work with through
unsafe pointers, to avoid leaks or undefined behavior"
*/
//This is the quickest fix
if (result != noErr) {
const char* msg = "AudioQueueSetProperty (kAudioQueueProperty_CurrentDevice)";
SDL_Log("COREAUDIO: Got error %d from '%s'!\n", (int)result, msg);
CFRelease(devuid);
SDL_SetError("CoreAudio error (%s): %d", msg, (int)result);
return 0;
}
//Release once you've finished using CFStringRef
CFRelease(devuid);
CFRelease(devuid); /* Release devuid; we're done with it and AudioQueueSetProperty should have retained if it wants to keep it. */
CHECK_RESULT("AudioQueueSetProperty (kAudioQueueProperty_CurrentDevice)");
return 1;
}
#endif