mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-10 19:09:45 +01:00
Code Issues Releases Wiki Activity

Unconditionally call FILESYSTEM_freeMemory() in SoundTrack constructor

Browse source 
Previously, it was guarded behind a check for the length, which is... I
guess still perfectly fine behavior, but there's no reason to have a
length check here; FILESYSTEM_freeMemory() uses SDL_free(), which does a
check that the pointer passed is non-NULL (the pointer that is passed
here, despite not being initialized upon declaration, is guaranteed to
be initialized by FILESYSTEM_loadFileToMemory() anyway, so).
This commit is contained in:
Misa 2021-02-15 19:05:01 -08:00 committed by Ethan Lee
parent b19daebeef
commit f401cc6230
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop_version/src/SoundSystem.cpp
View file

@ -35,10 +35,7 @@ SoundTrack::SoundTrack(const char* fileName)
FILESYSTEM_loadFileToMemory(fileName, &mem, &length); FILESYSTEM_loadFileToMemory(fileName, &mem, &length);
SDL_RWops *fileIn = SDL_RWFromMem(mem, length); SDL_RWops *fileIn = SDL_RWFromMem(mem, length);
sound = Mix_LoadWAV_RW(fileIn, 1); sound = Mix_LoadWAV_RW(fileIn, 1);
if (length)
{
FILESYSTEM_freeMemory(&mem); FILESYSTEM_freeMemory(&mem);
}
if (sound == NULL) if (sound == NULL)
{ {