diff options
| -rw-r--r-- | src/darray.h | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/src/darray.h b/src/darray.h index b75d85f..1fcce2b 100644 --- a/src/darray.h +++ b/src/darray.h @@ -97,8 +97,11 @@ typedef darray (unsigned long) darray_ulong; #define darray_append_items(arr, items, count) do { \ unsigned __count = (count), __oldSize = (arr).size; \ - darray_resize(arr, __oldSize + __count); \ - memcpy((arr).item + __oldSize, items, __count * sizeof(*(arr).item)); \ + size_t __total_size = __oldSize + __count; \ + if (__total_size <= UINT32_MAX) { \ + darray_resize(arr, __oldSize + __count); \ + memcpy((arr).item + __oldSize, items, __count * sizeof(*(arr).item)); \ + } \ } while (0) #define darray_from_items(arr, items, count) do { \ @@ -134,18 +137,24 @@ typedef darray (unsigned long) darray_ulong; #define darray_appends_nullterminate(arr, items, count) do { \ unsigned __count = (count), __oldSize = (arr).size; \ - darray_resize(arr, __oldSize + __count + 1); \ - memcpy((arr).item + __oldSize, items, __count * sizeof(*(arr).item)); \ - (arr).item[--(arr).size] = 0; \ + size_t __total_size = __oldSize + __count + 1; \ + if (__total_size <= UINT32_MAX) { \ + darray_resize(arr, __oldSize + __count + 1); \ + memcpy((arr).item + __oldSize, items, __count * sizeof(*(arr).item)); \ + (arr).item[--(arr).size] = 0; \ + } \ } while (0) #define darray_prepends_nullterminate(arr, items, count) do { \ unsigned __count = (count), __oldSize = (arr).size; \ - darray_resize(arr, __count + __oldSize + 1); \ - memmove((arr).item + __count, (arr).item, \ - __oldSize * sizeof(*(arr).item)); \ - memcpy((arr).item, items, __count * sizeof(*(arr).item)); \ - (arr).item[--(arr).size] = 0; \ + size_t __total_size = __count + __oldSize + 1; \ + if (__total_size <= UINT32_MAX) { \ + darray_resize(arr, __count + __oldSize + 1); \ + memmove((arr).item + __count, (arr).item, \ + __oldSize * sizeof(*(arr).item)); \ + memcpy((arr).item, items, __count * sizeof(*(arr).item)); \ + (arr).item[--(arr).size] = 0; \ + } \ } while (0) /*** Size management ***/ |