encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coreaudio: Don't crash on shutdown in a race condition. 

Fixed #6159.
This commit is contained in:
Ryan C. Gordon 2022-09-28 09:22:17 -04:00
parent d843d61cc1
commit 411582c710
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -523,8 +523,16 @@ outputCallback(void *inUserData, AudioQueueRef inAQ, AudioQueueBufferRef inBuffe
{ {
SDL_AudioDevice *this = (SDL_AudioDevice *) inUserData; SDL_AudioDevice *this = (SDL_AudioDevice *) inUserData;
/* This flag is set before this->mixer_lock is destroyed during
shutdown, so check it before grabbing the mutex, and then check it
again _after_ in case we blocked waiting on the lock. */
if (SDL_AtomicGet(&this->shutdown)) {
return; /* don't do anything, since we don't even want to enqueue this buffer again. */
}
SDL_LockMutex(this->mixer_lock); SDL_LockMutex(this->mixer_lock);
/* !!! FIXME: why do we have this->hidden->shutdown when this->shutdown exists? */
if (SDL_AtomicGet(&this->hidden->shutdown)) { if (SDL_AtomicGet(&this->hidden->shutdown)) {
SDL_UnlockMutex(this->mixer_lock); SDL_UnlockMutex(this->mixer_lock);
return; /* don't do anything, since we don't even want to enqueue this buffer again. */ return; /* don't do anything, since we don't even want to enqueue this buffer again. */