From 19339af706b3b201f41c32fd77b6466c91b852de Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 10 Jan 2020 14:56:21 -0700 Subject: [PATCH 1/2] avoid segfault with bad, missing, or corrupted audio --- desktop_version/src/SoundSystem.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop_version/src/SoundSystem.cpp b/desktop_version/src/SoundSystem.cpp index c0233573..e88d0eda 100644 --- a/desktop_version/src/SoundSystem.cpp +++ b/desktop_version/src/SoundSystem.cpp @@ -33,7 +33,7 @@ SoundTrack::SoundTrack(const char* fileName) FILESYSTEM_loadFileToMemory(fileName, &mem, &length); SDL_RWops *fileIn = SDL_RWFromMem(mem, length); sound = Mix_LoadWAV_RW(fileIn, 1); - FILESYSTEM_freeMemory(&mem); + if (length) FILESYSTEM_freeMemory(&mem); if (sound == NULL) { From f012f7c8b55e861130a90c4fc628aef38800fdff Mon Sep 17 00:00:00 2001 From: Moonchild Date: Fri, 10 Jan 2020 15:07:29 -0700 Subject: [PATCH 2/2] add myself to the contributors file, fix formatting --- desktop_version/CONTRIBUTORS.txt | 1 + desktop_version/src/SoundSystem.cpp | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/desktop_version/CONTRIBUTORS.txt b/desktop_version/CONTRIBUTORS.txt index 364ccd36..1079195e 100644 --- a/desktop_version/CONTRIBUTORS.txt +++ b/desktop_version/CONTRIBUTORS.txt @@ -2,3 +2,4 @@ Contributors ------------ * Christoph Böhmwalder (@chrboe) +* Elijah Stone diff --git a/desktop_version/src/SoundSystem.cpp b/desktop_version/src/SoundSystem.cpp index e88d0eda..ff7f4272 100644 --- a/desktop_version/src/SoundSystem.cpp +++ b/desktop_version/src/SoundSystem.cpp @@ -33,7 +33,10 @@ SoundTrack::SoundTrack(const char* fileName) FILESYSTEM_loadFileToMemory(fileName, &mem, &length); SDL_RWops *fileIn = SDL_RWFromMem(mem, length); sound = Mix_LoadWAV_RW(fileIn, 1); - if (length) FILESYSTEM_freeMemory(&mem); + if (length) + { + FILESYSTEM_freeMemory(&mem); + } if (sound == NULL) {