MrGeorgen/advanced_C_standard_library
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fix: wrong arraylist capacity value if realloc fails

Browse Source
This commit is contained in:
MrGeorgen
2020-08-07 13:44:31 +02:00
parent bb988bbef1
commit ddb9f42e8e
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/array.c
View File

@ -5,6 +5,15 @@
#include <acl/array.h> #include <acl/array.h>
size_t acl_arraylist_len(void *arraylist); size_t acl_arraylist_len(void *arraylist);
static inline void* acl_arraylist_resize(union acl_arraylist_meta *arraylist, int64_t relativLen) {
size_t cap = arraylist->cap + relativLen;
arraylist = realloc(arraylist, cap * arraylist->sizeof_one_element + sizeof *arraylist);
if(arraylist != NULL) {
arraylist->cap = cap;
}
return arraylist;
}
void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element) { void* acl_arraylist_create(size_t array_size, size_t sizeof_one_element) {
union acl_arraylist_meta *arraylist_new = malloc(array_size * sizeof_one_element + sizeof*arraylist_new); union acl_arraylist_meta *arraylist_new = malloc(array_size * sizeof_one_element + sizeof*arraylist_new);
if(arraylist_new == NULL) return NULL; if(arraylist_new == NULL) return NULL;
@ -26,9 +35,7 @@ void* acl_arraylist_append_ptr(void *arraylist_void, void **append_element) {
union acl_arraylist_meta *arraylist = arraylist_void; union acl_arraylist_meta *arraylist = arraylist_void;
--arraylist; --arraylist;
if(arraylist->len == arraylist->cap) { if(arraylist->len == arraylist->cap) {
if(arraylist->len > 10) arraylist->cap = arraylist->len + 10; acl_arraylist_resize(arraylist, 10);
else arraylist->cap = arraylist->len * 2 + 1;
arraylist = realloc(arraylist, arraylist->cap * arraylist->sizeof_one_element + sizeof *arraylist);
if(arraylist == NULL) return NULL; if(arraylist == NULL) return NULL;
} }
*append_element = (char*)(arraylist + 1) + arraylist->sizeof_one_element * arraylist->len; *append_element = (char*)(arraylist + 1) + arraylist->sizeof_one_element * arraylist->len;
@ -47,9 +54,9 @@ void* acl_arraylist_remove(void *arraylist_void, size_t index) {
memcpy(arraylist_char + arraylist->sizeof_one_element * index, arraylist_char + arraylist->sizeof_one_element * (arraylist->len - 1), arraylist->sizeof_one_element); memcpy(arraylist_char + arraylist->sizeof_one_element * index, arraylist_char + arraylist->sizeof_one_element * (arraylist->len - 1), arraylist->sizeof_one_element);
} }
--arraylist->len; --arraylist->len;
if(arraylist->len < arraylist->cap - 10) { if(arraylist->len < arraylist->cap - 20) {
arraylist->cap = arraylist->len; void* arraylistTmp = acl_arraylist_resize(arraylist, -10);
arraylist = realloc(arraylist, arraylist->cap * arraylist->sizeof_one_element + sizeof *arraylist); if(arraylistTmp != NULL) arraylist = arraylistTmp;
} }
return arraylist; return arraylist + 1;
} }