faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

array: allow arrays larger than 4 GB

Browse source 
It's not expected we will work with such large arrays anytime soon, but
better be safe than sorry.

Also, limit the number of elements to 2^31-1 to prevent infinite loop in
the calculation of allocated elements.
This commit is contained in:
Miroslav Lichvar 2015-06-08 14:43:16 +02:00
parent 08b152d6a2
commit 70b108ab69
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
array.c
View file

@ -44,6 +44,8 @@ ARR_CreateInstance(unsigned int elem_size)
{ {
ARR_Instance array; ARR_Instance array;
assert(elem_size > 0);
array = MallocNew(struct ARR_Instance_Record); array = MallocNew(struct ARR_Instance_Record);
array->data = NULL; array->data = NULL;
@ -64,6 +66,9 @@ ARR_DestroyInstance(ARR_Instance array)
static void static void
realloc_array(ARR_Instance array, unsigned int min_size) realloc_array(ARR_Instance array, unsigned int min_size)
{ {
size_t data_size;
assert(min_size <= 2 * min_size);
if (array->allocated >= min_size && array->allocated <= 2 * min_size) if (array->allocated >= min_size && array->allocated <= 2 * min_size)
return; return;
@ -74,7 +79,10 @@ realloc_array(ARR_Instance array, unsigned int min_size)
array->allocated = min_size; array->allocated = min_size;
} }
array->data = Realloc(array->data, array->elem_size * array->allocated); data_size = (size_t)array->elem_size * array->allocated;
assert(data_size / array->elem_size == array->allocated);
array->data = Realloc(array->data, data_size);
} }
void * void *
@ -89,7 +97,7 @@ void *
ARR_GetElement(ARR_Instance array, unsigned int index) ARR_GetElement(ARR_Instance array, unsigned int index)
{ {
assert(index < array->used); assert(index < array->used);
return (void *)((char *)array->data + index * array->elem_size); return (void *)((char *)array->data + (size_t)index * array->elem_size);
} }
void * void *