From c45b5121ced97ba6bd6af54acd241339fd69c7ed Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <[EMAIL REDACTED]>
Date: Thu, 26 Oct 2023 22:57:34 -0400
Subject: [PATCH] audio: Fixed potential race condition.
We need to check if the device is ready to close before releasing the lock,
in case other things are messing with the list of logical devices.
---
src/audio/SDL_audio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index 47d4878436e7..456ce44fbbb6 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -1353,9 +1353,12 @@ void SDL_CloseAudioDevice(SDL_AudioDeviceID devid)
SDL_AudioDevice *device = logdev->physical_device;
DestroyLogicalAudioDevice(logdev);
+ const SDL_bool close_physical = (device->logical_devices == NULL); // no more logical devices? Close the physical device, too.
+
// !!! FIXME: we _need_ to release this lock, but doing so can cause a race condition if someone opens a device while we're closing it.
SDL_UnlockMutex(device->lock); // can't hold the lock or the audio thread will deadlock while we WaitThread it. If not closing, we're done anyhow.
- if (device->logical_devices == NULL) { // no more logical devices? Close the physical device, too.
+
+ if (close_physical) {
ClosePhysicalAudioDevice(device);
}