Commit 4fcbc47059aa6c714fa87bc24115edcad86ca5bb

Daniel Stone 2017-06-26T21:49:49

darray: Don't call memcpy() on NULL The only time we could ever hit this was with count == 0, which seems unnecessarily pedantic. But OK. Signed-off-by: Daniel Stone <daniels@collabora.com>

1
2
3
4
5
6
7
8
9
10
11
12
13
14
diff --git a/src/darray.h b/src/darray.h
index e9da974..c30fd7d 100644
--- a/src/darray.h
+++ b/src/darray.h
@@ -104,7 +104,8 @@ typedef darray (unsigned long)  darray_ulong;
 #define darray_from_items(arr, items, count) do { \
     unsigned __count = (count); \
     darray_resize(arr, __count); \
-    memcpy((arr).item, items, __count * sizeof(*(arr).item)); \
+    if (count != 0) \
+        memcpy((arr).item, items, __count * sizeof(*(arr).item)); \
 } while (0)
 
 #define darray_copy(arr_to, arr_from) \