From 8052f61cef9a0d9ecdef9960beb1408679897403 Mon Sep 17 00:00:00 2001 From: Misa Date: Mon, 15 Feb 2021 19:07:32 -0800 Subject: [PATCH] Check if file can't be loaded in SoundTrack::SoundTrack() This adds a check that the pointer passed to FILESYSTEM_loadFileToMemory() isn't NULL, and if it is, just returns early in the function, instead of continuing later and producing a different, slightly-misleading error message. --- desktop_version/src/SoundSystem.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/desktop_version/src/SoundSystem.cpp b/desktop_version/src/SoundSystem.cpp index e9c9c718..4fdbb1ba 100644 --- a/desktop_version/src/SoundSystem.cpp +++ b/desktop_version/src/SoundSystem.cpp @@ -33,6 +33,11 @@ SoundTrack::SoundTrack(const char* fileName) unsigned char *mem; size_t length = 0; FILESYSTEM_loadFileToMemory(fileName, &mem, &length); + if (mem == NULL) + { + fprintf(stderr, "Unable to load WAV file %s\n", fileName); + return; + } SDL_RWops *fileIn = SDL_RWFromMem(mem, length); sound = Mix_LoadWAV_RW(fileIn, 1); FILESYSTEM_freeMemory(&mem);