HideyoshiNakazone/dynamic_array
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add null checks to dynamic array macros for improved safety

Browse Source
This commit is contained in:
Vitor Hideyoshi
2026-04-15 20:59:52 -03:00
parent 60f9f88af2
commit 09e1a360fd
1 changed files with 57 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/dynamic_array.h
View File

@@ -25,43 +25,61 @@ typedef struct {
#define array_create(arr) \
do { \
ArrayHeader *header = malloc(sizeof(*arr) * DYNAMIC_ARRAY_DEFAULT_ARRAY_SIZE + sizeof(ArrayHeader)); \
ArrayHeader *header = malloc( \
sizeof(*(arr)) * DYNAMIC_ARRAY_DEFAULT_ARRAY_SIZE + sizeof(ArrayHeader) \
); \
if (header == NULL) { \
abort(); \
} \
header->size = 0; \
header->capacity = DYNAMIC_ARRAY_DEFAULT_ARRAY_SIZE; \
\
arr = (void *)(header + 1); \
(arr) = (void *)(header + 1); \
} while(0)
#define array_get_header(arr) ((ArrayHeader*)(arr) - 1)
#define array_get_header(arr) \
((arr) ? ((ArrayHeader*)(arr) - 1) : NULL)
#define array_destroy(arr) \
do { \
if ((arr) == NULL) { \
break; \
} \
free(array_get_header(arr)); \
arr = NULL; \
(arr) = NULL; \
} while (0)
#define array_push_value(arr, value) \
do { \
if ((arr) == NULL) { \
array_create(arr); \
} \
ArrayHeader *header = array_get_header(arr); \
if (header->size + 1 > header->capacity) { \
if (header->size >= header->capacity) { \
size_t new_capacity = header->capacity * DYNAMIC_ARRAY_CAPACITY_FACTOR; \
ArrayHeader *new_header = realloc(header, sizeof(*arr) * new_capacity + sizeof(ArrayHeader)); \
if (new_header != NULL) { \
ArrayHeader *new_header = realloc( \
header, sizeof(*(arr)) * new_capacity + sizeof(ArrayHeader) \
); \
if (new_header == NULL) { \
abort(); \
} \
header = new_header; \
} \
header->capacity = new_capacity; \
arr = (void *)(header + 1); \
(arr) = (void *)(header + 1); \
} \
arr[header->size] = value; \
(arr)[header->size] = (value); \
header->size++; \
} while (0)
#define array_pop(arr) \
do { \
if ((arr) == NULL) { \
break; \
} \
ArrayHeader *header = array_get_header(arr); \
if (header->size == 0) { \
break; \
@@ -70,4 +88,10 @@ typedef struct {
} while (0)
#define array_size(arr) \
((arr) ? array_get_header(arr)->size : 0)
#define array_capacity(arr) \
((arr) ? array_get_header(arr)->capacity : 0)
#endif