Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better protect against improper alSoundfontSamplesSOFT calls

Browse Source
This commit is contained in:
Chris Robinson
2013-12-20 00:47:12 -08:00
parent d596cf9cf3
commit 5dc3f3626d
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/midi/base.c
+1
View File
@@ -429,6 +429,7 @@ void ALsoundfont_Construct(ALsoundfont *self)
self->Samples = NULL;
self->NumSamples = 0;
RWLockInit(&self->Lock);
self->Mapped = AL_FALSE;
self->id = 0;
OpenAL32/Include/alMidi.h
+1
View File
@@ -117,6 +117,7 @@ typedef struct ALsoundfont {
ALshort *Samples;
ALint NumSamples;
RWLock Lock;
volatile ALenum Mapped;
ALuint id;
OpenAL32/alSoundfont.c
+20 -9
View File
@@ -124,6 +124,7 @@ AL_API ALvoid AL_APIENTRY alSoundfontSamplesSOFT(ALuint sfid, ALenum type, ALsiz
ALCdevice *device;
ALCcontext *context;
ALsoundfont *sfont;
void *ptr;
context = GetContextRef();
if(!context) return;
@@ -136,16 +137,21 @@ AL_API ALvoid AL_APIENTRY alSoundfontSamplesSOFT(ALuint sfid, ALenum type, ALsiz
if(count <= 0)
SET_ERROR_AND_GOTO(context, AL_INVALID_VALUE, done);
// TODO: Lock and check ref count
WriteLock(&sfont->Lock);
if(sfont->ref != 0)
alSetError(context, AL_INVALID_OPERATION);
else if(sfont->Mapped)
alSetError(context, AL_INVALID_OPERATION);
else if(!(ptr=realloc(sfont->Samples, count * sizeof(ALshort))))
alSetError(context, AL_OUT_OF_MEMORY);
else
{
void *temp = realloc(sfont->Samples, count * sizeof(ALshort));
if(!temp)
SET_ERROR_AND_GOTO(context, AL_OUT_OF_MEMORY, done);
sfont->Samples = temp;
sfont->Samples = ptr;
sfont->NumSamples = count;
if(samples)
if(samples != NULL)
memcpy(sfont->Samples, samples, count * sizeof(ALshort));
}
WriteUnlock(&sfont->Lock);
done:
ALCcontext_DecRef(context);
@@ -168,10 +174,15 @@ AL_API ALvoid* AL_APIENTRY alSoundfontMapSamplesSOFT(ALuint sfid, ALsizei offset
SET_ERROR_AND_GOTO(context, AL_INVALID_VALUE, done);
if(length <= 0 || (ALuint)length > (sfont->NumSamples*sizeof(ALshort) - offset))
SET_ERROR_AND_GOTO(context, AL_INVALID_VALUE, done);
if(ExchangeInt(&sfont->Mapped, AL_TRUE) == AL_TRUE)
SET_ERROR_AND_GOTO(context, AL_INVALID_OPERATION, done);
ptr = (ALbyte*)sfont->Samples + offset;
ReadLock(&sfont->Lock);
if(sfont->ref != 0)
alSetError(context, AL_INVALID_OPERATION);
else if(ExchangeInt(&sfont->Mapped, AL_TRUE) == AL_TRUE)
alSetError(context, AL_INVALID_OPERATION);
else
ptr = (ALbyte*)sfont->Samples + offset;
ReadUnlock(&sfont->Lock);
done:
ALCcontext_DecRef(context);