From 1aeb87ac523fe975ae2c2832919cdc7bfa85581a Mon Sep 17 00:00:00 2001 From: jp9000 Date: Wed, 18 Jul 2018 18:42:04 -0700 Subject: [PATCH] libobs/util: Don't use assert for darray_push_back_array Instead, just check to see whether array and num are valid, and if they are not, safely return. --- libobs/util/darray.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libobs/util/darray.h b/libobs/util/darray.h index 99f35d69f..69e1c40a2 100644 --- a/libobs/util/darray.h +++ b/libobs/util/darray.h @@ -207,11 +207,13 @@ static inline void *darray_push_back_new(const size_t element_size, static inline size_t darray_push_back_array(const size_t element_size, struct darray *dst, const void *array, const size_t num) { - size_t old_num = dst->num; - - assert(array != NULL); - assert(num != 0); + size_t old_num; + if (!dst) + return 0; + if (!array || !num) + return dst->num; + old_num = dst->num; darray_resize(element_size, dst, dst->num+num); memcpy(darray_item(element_size, dst, old_num), array, element_size*num);