From a48f5d26fda855963fb930a75691b932e837dd2d Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Thu, 22 May 2014 12:16:22 -0700 Subject: Ensure a proper amount of new elements are being reserved when inserting --- Alc/helpers.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Alc/helpers.c') diff --git a/Alc/helpers.c b/Alc/helpers.c index 4b5eceb7..a0230b7c 100644 --- a/Alc/helpers.c +++ b/Alc/helpers.c @@ -631,8 +631,12 @@ ALboolean vector_insert(void *ptr, size_t base_size, size_t obj_size, void *ins_ { ptrdiff_t ins_elem = ((char*)ins_pos - ((char*)(*vecptr) + base_size)) / obj_size; ptrdiff_t numins = ((const char*)datend - (const char*)datstart) / obj_size; - if(!vector_reserve(vecptr, base_size, VECTOR_SIZE(*vecptr)+numins, obj_size, AL_TRUE)) + + assert(numins > 0); + if(INT_MAX-VECTOR_SIZE(*vecptr) <= numins || + !vector_reserve(vecptr, base_size, VECTOR_SIZE(*vecptr)+numins, obj_size, AL_TRUE)) return AL_FALSE; + /* NOTE: ins_pos may have been invalidated if *vecptr moved. Use ins_elem instead. */ if(ins_elem < (*vecptr)->Size) { -- cgit v1.2.3