aboutsummaryrefslogtreecommitdiff
path: root/src/util/program.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
committerChristian Grothoff <christian@grothoff.org>2016-07-08 17:20:23 +0000
commitd8c53b12a818ff7cf82d06a1a69c395bdef85ee6 (patch)
tree0ebb0db416c157fcfde51a941185819dd12d51fd /src/util/program.c
parent5184c17d32a39c928c2a0fec3ee1ad098bbaa562 (diff)
downloadgnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.tar.gz
gnunet-d8c53b12a818ff7cf82d06a1a69c395bdef85ee6.zip
-avoid calling memcpy() with NULL argument, even if len is 0
Diffstat (limited to 'src/util/program.c')
-rw-r--r--src/util/program.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util/program.c b/src/util/program.c
index 72f6a1e6c..d0dd49909 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -204,8 +204,8 @@ GNUNET_PROGRAM_run2 (int argc, char *const *argv, const char *binaryName,
204 GNUNET_malloc ((cnt + 204 GNUNET_malloc ((cnt +
205 1) * sizeof (struct GNUNET_GETOPT_CommandLineOption) + 205 1) * sizeof (struct GNUNET_GETOPT_CommandLineOption) +
206 sizeof (defoptions)); 206 sizeof (defoptions));
207 memcpy (allopts, defoptions, sizeof (defoptions)); 207 GNUNET_memcpy (allopts, defoptions, sizeof (defoptions));
208 memcpy (&allopts 208 GNUNET_memcpy (&allopts
209 [sizeof (defoptions) / 209 [sizeof (defoptions) /
210 sizeof (struct GNUNET_GETOPT_CommandLineOption)], options, 210 sizeof (struct GNUNET_GETOPT_CommandLineOption)], options,
211 (cnt + 1) * sizeof (struct GNUNET_GETOPT_CommandLineOption)); 211 (cnt + 1) * sizeof (struct GNUNET_GETOPT_CommandLineOption));