diff options
| author | Chris Robinson <[email protected]> | 2010-09-21 14:41:43 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2010-09-21 14:41:43 -0700 |
| commit | 301a8ba3a403ece650790d015995a56f27718115 (patch) | |
| tree | 93209e28addade1840459e18624ea0639fa17b2e /OpenAL32 | |
| parent | 2d4453968d67af5cfee81c09adcc7b1ac6bd03f6 (diff) | |
Improve some range checks
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/alAuxEffectSlot.c | 6 | ||||
| -rw-r--r-- | OpenAL32/alSource.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/OpenAL32/alAuxEffectSlot.c b/OpenAL32/alAuxEffectSlot.c index d8ccaf71..9c5cf5fc 100644 --- a/OpenAL32/alAuxEffectSlot.c +++ b/OpenAL32/alAuxEffectSlot.c @@ -45,11 +45,13 @@ AL_API ALvoid AL_APIENTRY alGenAuxiliaryEffectSlots(ALsizei n, ALuint *effectslo Context = GetContextSuspended(); if(!Context) return; - if(n > 0) + if(n < 0) + alSetError(Context, AL_INVALID_VALUE); + else { ALCdevice *Device = Context->Device; - if(Context->EffectSlotMap.size+n <= (ALsizei)Device->AuxiliaryEffectSlotMax) + if((ALuint)n <= Device->AuxiliaryEffectSlotMax - Context->EffectSlotMap.size) { // Check that enough memory has been allocted in the 'effectslots' array for n Effect Slots if(!IsBadWritePtr((void*)effectslots, n * sizeof(ALuint))) diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index c9051793..32e8c4da 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -62,7 +62,7 @@ AL_API ALvoid AL_APIENTRY alGenSources(ALsizei n,ALuint *sources) if(!IsBadWritePtr((void*)sources, n * sizeof(ALuint))) { // Check that the requested number of sources can be generated - if((Context->SourceMap.size + n) <= (ALsizei)Device->MaxNoOfSources) + if((ALuint)n <= Device->MaxNoOfSources - Context->SourceMap.size) { ALenum err; |