summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authorPablo Barciela <[email protected]>2019-03-12 21:29:21 +0100
committerZenWalker <[email protected]>2019-03-24 00:47:00 +0100
commitcd18ffe0df626dce052361c9f82bd8487ddc1879 (patch)
treeeaa804baac93fcf816c5602471efd4c7ee7c8cd0 /libcaja-private
parentc65f277ade99c9708ddff2bb4faa1160ff369395 (diff)
downloadcaja-cd18ffe0df626dce052361c9f82bd8487ddc1879.tar.bz2
caja-cd18ffe0df626dce052361c9f82bd8487ddc1879.tar.xz
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 *)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-autorun.c5
1 files changed, 4 insertions, 1 deletions
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);