From d8c53b12a818ff7cf82d06a1a69c395bdef85ee6 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 8 Jul 2016 17:20:23 +0000
Subject: -avoid calling memcpy() with NULL argument, even if len is 0

---
 src/dv/gnunet-service-dv.c   | 8 ++++----
 src/dv/plugin_transport_dv.c | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/dv')

diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c
index d103612a8..2827a17f2 100644
--- a/src/dv/gnunet-service-dv.c
+++ b/src/dv/gnunet-service-dv.c
@@ -452,7 +452,7 @@ send_data_to_plugin (const struct GNUNET_MessageHeader *message,
   received_msg->header.type = htons (GNUNET_MESSAGE_TYPE_DV_RECV);
   received_msg->distance = htonl (distance);
   received_msg->sender = *origin;
-  memcpy (&received_msg[1], message, ntohs (message->size));
+  GNUNET_memcpy (&received_msg[1], message, ntohs (message->size));
   GNUNET_SERVER_notification_context_broadcast (nc,
 						&received_msg->header,
 						GNUNET_YES);
@@ -580,7 +580,7 @@ core_transmit_notify (void *cls, size_t size, void *buf)
     GNUNET_CONTAINER_DLL_remove (dn->pm_head,
 				 dn->pm_tail,
                                  pending);
-    memcpy (&cbuf[off], pending->msg, msize);
+    GNUNET_memcpy (&cbuf[off], pending->msg, msize);
     GNUNET_free (pending);
     off += msize;
   }
@@ -648,7 +648,7 @@ forward_payload (struct DirectNeighbor *target,
   rm->distance = htonl (distance);
   rm->target = *actual_target;
   rm->sender = *sender;
-  memcpy (&rm[1], payload, ntohs (payload->size));
+  GNUNET_memcpy (&rm[1], payload, ntohs (payload->size));
   GNUNET_CONTAINER_DLL_insert_tail (target->pm_head,
 				    target->pm_tail,
 				    pm);
@@ -1500,7 +1500,7 @@ handle_set_union_result (void *cls,
       return;
     }
     target = GNUNET_new (struct Target);
-    memcpy (target, element->data, sizeof (struct Target));
+    GNUNET_memcpy (target, element->data, sizeof (struct Target));
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "Received information about peer `%s' with distance %u from SET\n",
                 GNUNET_i2s (&target->peer),
diff --git a/src/dv/plugin_transport_dv.c b/src/dv/plugin_transport_dv.c
index 0c72cea3f..51d75330f 100644
--- a/src/dv/plugin_transport_dv.c
+++ b/src/dv/plugin_transport_dv.c
@@ -487,7 +487,7 @@ dv_plugin_send (void *cls,
     box = GNUNET_malloc (sizeof (struct GNUNET_MessageHeader) + msgbuf_size);
     box->type = htons (GNUNET_MESSAGE_TYPE_DV_BOX);
     box->size = htons (sizeof (struct GNUNET_MessageHeader) + msgbuf_size);
-    memcpy (&box[1], msgbuf, msgbuf_size);
+    GNUNET_memcpy (&box[1], msgbuf, msgbuf_size);
     msg = box;
   }
   GNUNET_DV_send (plugin->dvh,
-- 
cgit v1.2.3