jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs/util: Don't use assert for darray_push_back_array

Browse Source 
Instead, just check to see whether array and num are valid, and if they
are not, safely return.
This commit is contained in:
jp9000
2018-07-18 18:42:04 -07:00
parent 3a08e858a6
commit 1aeb87ac52
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libobs/util/darray.h
View File

@@ -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);