AuroraMiddleware/AuroraOpenALSoft
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't allow soundfonts with existing presets in alLoadSoundfontSOFT

Browse Source
This commit is contained in:
Chris Robinson 2014-01-01 07:33:48 -08:00
parent 0a5a08c0fb
commit 7d94e9c52f
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Alc/midi/sf2load.c
View File

@ -1322,35 +1322,25 @@ ALboolean loadSf2(Reader *stream, ALsoundfont *soundfont, ALCcontext *context)
GenModList_Destruct(&gzone);
IDList_Destruct(&fsids);
}
if(pids.ids_size > 0)
{
ALsizei count = pids.ids_size;
ALsfpreset **presets;
ALsfpreset **presets = NULL;
ALCdevice *device = context->Device;
if(count == 0)
presets = NULL;
else
presets = calloc(pids.ids_size, sizeof(presets[0]));
if(!presets)
SET_ERROR_AND_GOTO(context, AL_OUT_OF_MEMORY, error);
for(i = 0;i < pids.ids_size;i++)
{
ALCdevice *device = context->Device;
presets = calloc(count, sizeof(presets[0]));
if(!presets)
SET_ERROR_AND_GOTO(context, AL_OUT_OF_MEMORY, error);
for(i = 0;i < count;i++)
{
if(!(presets[i]=LookupPreset(device, pids.ids[i])))
SET_ERROR_AND_GOTO(context, AL_INVALID_VALUE, error);
}
if(!(presets[i]=LookupPreset(device, pids.ids[i])))
SET_ERROR_AND_GOTO(context, AL_INVALID_VALUE, error);
}
for(i = 0;i < count;i++)
for(i = 0;i < pids.ids_size;i++)
IncrementRef(&presets[i]->ref);
presets = ExchangePtr((XchgPtr*)&soundfont->Presets, presets);
count = ExchangeInt(&soundfont->NumPresets, count);
for(i = 0;i < count;i++)
DecrementRef(&presets[i]->ref);
free(presets);
}

5
OpenAL32/alMidi.c
View File

@ -86,6 +86,11 @@ AL_API void AL_APIENTRY alLoadSoundfontSOFT(ALuint id, size_t(*cb)(ALvoid*,size_
WriteUnlock(&sfont->Lock);
SET_ERROR_AND_GOTO(context, AL_INVALID_OPERATION, done);
}
if(sfont->NumPresets > 0)
{
WriteUnlock(&sfont->Lock);
SET_ERROR_AND_GOTO(context, AL_INVALID_OPERATION, done);
}
reader.cb = cb;
reader.ptr = user;