Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Be more cautious about dynamically loaded sdl mixer chunks (stratagus#422)

Browse source
This commit is contained in:
Tim Felgentreff 2022-12-27 08:38:37 +01:00
parent 442a8a9d69
commit 6f11d22949
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/sound/sound_server.cpp
View file

@ -400,7 +400,7 @@ static Mix_Chunk *ForceLoadSample(const char *name)
static Mix_Chunk *LoadSample(const char *name)
{
#ifdef DYNAMIC_LOAD
Mix_Chunk *r = (Mix_Chunk *)calloc(sizeof(Mix_Chunk), 1);
Mix_Chunk *r = (Mix_Chunk *)SDL_calloc(sizeof(Mix_Chunk), 1);
r->allocated = 0xcafebeef;
r->abuf = (Uint8 *)(strdup(name));
return r;
@ -459,7 +459,9 @@ void FreeSample(Mix_Chunk *sample)
return;
}
#endif
Mix_FreeChunk(sample);
if (sample->allocated == 1) {
Mix_FreeChunk(sample);
}
}
/**
@ -478,6 +480,7 @@ static int PlaySample(Mix_Chunk *sample, Origin *origin, void (*callback)(int ch
if (loadedSample) {
memcpy(sample, loadedSample, sizeof(Mix_Chunk));
free(name);
SDL_free(loadedSample);
} else {
return -1;
}