mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-15 14:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

alsa: Don't touch free'd memory in hotplug thread.

Browse Source
This commit is contained in:
Ryan C. Gordon
2023-10-23 00:59:40 -04:00
parent 43d41c9dcb
commit 4ac38d13dd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/audio/alsa/SDL_alsa_audio.c
View File

@@ -724,10 +724,13 @@ static void add_device(const SDL_bool iscapture, const char *name, void *hint, A
//SDL_LogInfo(SDL_LOG_CATEGORY_AUDIO, "ALSA: adding %s device '%s' (%s)", iscapture ? "capture" : "output", name, desc); //SDL_LogInfo(SDL_LOG_CATEGORY_AUDIO, "ALSA: adding %s device '%s' (%s)", iscapture ? "capture" : "output", name, desc);
handle = SDL_strdup(name); handle = SDL_strdup(name);
if (handle == NULL) { dev->name = SDL_strdup(name);
if (!handle || !dev->name) {
if (hint) { if (hint) {
free(desc); // This should NOT be SDL_free() free(desc); // This should NOT be SDL_free()
} }
SDL_free(handle);
SDL_free(dev->name);
SDL_free(dev); SDL_free(dev);
return; return;
} }
@@ -739,7 +742,7 @@ static void add_device(const SDL_bool iscapture, const char *name, void *hint, A
if (hint) { if (hint) {
free(desc); // This should NOT be SDL_free() free(desc); // This should NOT be SDL_free()
} }
dev->name = handle;
dev->iscapture = iscapture; dev->iscapture = iscapture;
dev->next = *pSeen; dev->next = *pSeen;
*pSeen = dev; *pSeen = dev;
@@ -875,6 +878,7 @@ static void ALSA_HotplugIteration(SDL_bool *has_default_output, SDL_bool *has_de
//SDL_LogInfo(SDL_LOG_CATEGORY_AUDIO, "ALSA: removing %s device '%s'", dev->iscapture ? "capture" : "output", dev->name); //SDL_LogInfo(SDL_LOG_CATEGORY_AUDIO, "ALSA: removing %s device '%s'", dev->iscapture ? "capture" : "output", dev->name);
next = dev->next; next = dev->next;
SDL_AudioDeviceDisconnected(SDL_FindPhysicalAudioDeviceByHandle(dev->name)); SDL_AudioDeviceDisconnected(SDL_FindPhysicalAudioDeviceByHandle(dev->name));
SDL_free(dev->name);
SDL_free(dev); SDL_free(dev);
} }
} }
@@ -939,6 +943,7 @@ static void ALSA_DeinitializeStart(void)
for (dev = hotplug_devices; dev; dev = next) { for (dev = hotplug_devices; dev; dev = next) {
//SDL_LogInfo(SDL_LOG_CATEGORY_AUDIO, "ALSA: at shutdown, removing %s device '%s'", dev->iscapture ? "capture" : "output", dev->name); //SDL_LogInfo(SDL_LOG_CATEGORY_AUDIO, "ALSA: at shutdown, removing %s device '%s'", dev->iscapture ? "capture" : "output", dev->name);
next = dev->next; next = dev->next;
SDL_free(dev->name);
SDL_free(dev); SDL_free(dev);
} }
hotplug_devices = NULL; hotplug_devices = NULL;