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

Add some integer casts, and a range check

Browse Source
This commit is contained in:
Chris Robinson 2014-03-23 15:22:37 -07:00
parent 55f851093f
commit 83038c0dab
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Alc/helpers.c
View File

@ -708,12 +708,17 @@ ALboolean vector_reserve(void *ptr, size_t orig_count, size_t base_size, size_t
vector_ *vecptr = ptr;
void *temp;
/* Limit vector sizes to the greatest power-of-two value that an
* ALsizei can hold. */
if(obj_count > (INT_MAX>>1)+1)
return AL_FALSE;
/* Use the next power-of-2 size if we don't need to allocate the exact
* amount. This is preferred when regularly increasing the vector since
* it means fewer reallocations. Though it means it also wastes some
* memory. */
if(exact == AL_FALSE)
obj_count = NextPowerOf2(obj_count);
obj_count = NextPowerOf2((ALuint)obj_count);
/* Need to be explicit with the caller type's base size, because it
* could have extra padding before the start of the array (that is,
@ -722,7 +727,7 @@ ALboolean vector_reserve(void *ptr, size_t orig_count, size_t base_size, size_t
if(temp == NULL) return AL_FALSE;
*vecptr = temp;
(*vecptr)->Capacity = obj_count;
(*vecptr)->Capacity = (ALsizei)obj_count;
}
return AL_TRUE;
}

2
Alc/midi/sf2load.c
View File

@ -814,7 +814,7 @@ static void fillZone(ALfontsound *sound, ALCcontext *context, const GenModList *
src1in != AL_INVALID && src1form != AL_INVALID && src0type != AL_INVALID &&
trans != AL_INVALID)
{
ALsizei idx = mod - VECTOR_ITER_BEGIN(zone->mods);
ALsizei idx = (ALsizei)(mod - VECTOR_ITER_BEGIN(zone->mods));
ALfontsound_setModStagei(sound, context, idx, AL_SOURCE0_INPUT_SOFT, src0in);
ALfontsound_setModStagei(sound, context, idx, AL_SOURCE0_TYPE_SOFT, src0type);
ALfontsound_setModStagei(sound, context, idx, AL_SOURCE0_FORM_SOFT, src0form);