From cd18ffe0df626dce052361c9f82bd8487ddc1879 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Tue, 12 Mar 2019 21:29:21 +0100 Subject: caja-autorun: avoid NULL in 'memcpy' Fixes Clang static analyzer warning: caja-autorun.c:139:5: warning: Null pointer passed as an argument to a 'nonnull' parameter memcpy (r, v, len * sizeof (char *)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- libcaja-private/caja-autorun.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libcaja-private') diff --git a/libcaja-private/caja-autorun.c b/libcaja-private/caja-autorun.c index e60fe8a6..04033445 100644 --- a/libcaja-private/caja-autorun.c +++ b/libcaja-private/caja-autorun.c @@ -136,7 +136,10 @@ add_elem_to_str_array (char **v, const char *s) len = v != NULL ? g_strv_length (v) : 0; r = g_new0 (char *, len + 2); - memcpy (r, v, len * sizeof (char *)); + + if (v) + memcpy (r, v, len * sizeof (char *)); + r[len] = g_strdup (s); r[len+1] = NULL; g_free (v); -- cgit v1.2.1