aboutsummaryrefslogtreecommitdiff
path: root/src/gns/gnunet-dns2gns.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/gns/gnunet-dns2gns.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/gns/gnunet-dns2gns.c')
-rw-r--r--src/gns/gnunet-dns2gns.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index df3b4e882..73d5eab6c 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -335,7 +335,7 @@ result_processor (void *cls,
335 rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET; 335 rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
336 rec.type = GNUNET_DNSPARSER_TYPE_A; 336 rec.type = GNUNET_DNSPARSER_TYPE_A;
337 rec.data.raw.data = GNUNET_new (struct in_addr); 337 rec.data.raw.data = GNUNET_new (struct in_addr);
338 memcpy (rec.data.raw.data, 338 GNUNET_memcpy (rec.data.raw.data,
339 rd[i].data, 339 rd[i].data,
340 rd[i].data_size); 340 rd[i].data_size);
341 rec.data.raw.data_len = sizeof (struct in_addr); 341 rec.data.raw.data_len = sizeof (struct in_addr);
@@ -349,7 +349,7 @@ result_processor (void *cls,
349 rec.data.raw.data = GNUNET_new (struct in6_addr); 349 rec.data.raw.data = GNUNET_new (struct in6_addr);
350 rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET; 350 rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
351 rec.type = GNUNET_DNSPARSER_TYPE_AAAA; 351 rec.type = GNUNET_DNSPARSER_TYPE_AAAA;
352 memcpy (rec.data.raw.data, 352 GNUNET_memcpy (rec.data.raw.data,
353 rd[i].data, 353 rd[i].data,
354 rd[i].data_size); 354 rd[i].data_size);
355 rec.data.raw.data_len = sizeof (struct in6_addr); 355 rec.data.raw.data_len = sizeof (struct in6_addr);
@@ -362,7 +362,7 @@ result_processor (void *cls,
362 rec.data.hostname = GNUNET_strdup (rd[i].data); 362 rec.data.hostname = GNUNET_strdup (rd[i].data);
363 rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET; 363 rec.dns_traffic_class = GNUNET_TUN_DNS_CLASS_INTERNET;
364 rec.type = GNUNET_DNSPARSER_TYPE_CNAME; 364 rec.type = GNUNET_DNSPARSER_TYPE_CNAME;
365 memcpy (rec.data.hostname, 365 GNUNET_memcpy (rec.data.hostname,
366 rd[i].data, 366 rd[i].data,
367 rd[i].data_size); 367 rd[i].data_size);
368 GNUNET_array_append (packet->answers, 368 GNUNET_array_append (packet->answers,
@@ -439,7 +439,7 @@ handle_request (struct GNUNET_NETWORK_Handle *lsock,
439 request->packet = packet; 439 request->packet = packet;
440 request->addr = &request[1]; 440 request->addr = &request[1];
441 request->addr_len = addr_len; 441 request->addr_len = addr_len;
442 memcpy (&request[1], addr, addr_len); 442 GNUNET_memcpy (&request[1], addr, addr_len);
443 request->timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, 443 request->timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT,
444 &do_timeout, 444 &do_timeout,
445 request); 445 request);