TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix SDL2 double-free on failure to load music

Browse source 
Fixes: 0142c02edd ("Use Mix_LoadMUSType_RW for named files, too")
This commit is contained in:
Kp 2022-09-24 17:47:53 +00:00
parent 0ed90715b6
commit 53d81e78de
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/arch/sdl/digi_mixer_music.cpp
View file

@ -32,12 +32,6 @@ namespace dcx {
namespace {
#if SDL_MIXER_MAJOR_VERSION == 2
#define DXX_SDL_MIXER_MANAGES_RWOPS 1
#else
#define DXX_SDL_MIXER_MANAGES_RWOPS 0
#endif
struct Music_delete
{
void operator()(Mix_Music *m) const
@ -70,11 +64,19 @@ void current_music_t::reset(SDL_RWops *const rw)
return;
}
reset(Mix_LoadMUSType_RW(rw, MUS_NONE, SDL_TRUE));
if (!*this)
/* If the underlying resource failed to load, then SDL does not
* free the RWops structure. Free it here.
if constexpr (SDL_MIXER_MAJOR_VERSION == 1)
{
/* In SDL_mixer-1, setting freesrc==SDL_TRUE only transfers ownership
* of the RWops structure on success. On failure, the structure is
* still owned by the caller, and must be freed here.
*
* In SDL_mixer-2, setting freesrc==SDL_TRUE always transfers ownership
* of the RWops structure. On failure, SDL_mixer-2 will free the RWops
* before returning, so the structure must not be freed here.
*/
SDL_RWclose(rw);
if (!*this)
SDL_RWclose(rw);
}
}
static current_music_t current_music;