-avoid calling memcpy() with NULL argument, even if len is 0

9 files changed, 32 insertions, 28 deletions

diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index c2f506f6d..ed7009e02 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -321,7 +321,7 @@ iterate_cb (void *cls,
   if (bytes_free < (strlen (name) + strlen (pkey) + 40))
   {
     new_buf = GNUNET_malloc (zr->buf_len * 2);
-    memcpy (new_buf, zr->zoneinfo, zr->write_offset);
+    GNUNET_memcpy (new_buf, zr->zoneinfo, zr->write_offset);
     GNUNET_free (zr->zoneinfo);
     zr->zoneinfo = new_buf;
     zr->buf_len *= 2;
@@ -456,7 +456,7 @@ post_iterator (void *cls,
     {
       if (size + off >= sizeof(request->domain_name))
         size = sizeof (request->domain_name) - off - 1;
-      memcpy (&request->domain_name[off],
+      GNUNET_memcpy (&request->domain_name[off],
               data,
               size);
       request->domain_name[size+off] = '\0';
@@ -466,7 +466,7 @@ post_iterator (void *cls,
     {
       if (size + off >= sizeof(request->public_key))
         size = sizeof (request->public_key) - off - 1;
-      memcpy (&request->public_key[off],
+      GNUNET_memcpy (&request->public_key[off],
               data,
               size);
       request->public_key[size+off] = '\0';
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 90214e9d6..43cabed2a 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -536,7 +536,7 @@ get_existing_record (void *cls,
     break;
   }
   memset (rdn, 0, sizeof (struct GNUNET_GNSRECORD_Data));
-  memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
+  GNUNET_memcpy (&rdn[1], rd, rd_count * sizeof (struct GNUNET_GNSRECORD_Data));
   rde = &rdn[0];
   rde->data = data;
   rde->data_size = data_size;
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index aeec2d10b..3df8a4ddd 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -428,7 +428,9 @@ lookup_nick_it (void *cls,
     {
       (*res) = GNUNET_malloc (rd[c].data_size + sizeof (struct GNUNET_GNSRECORD_Data));
       (*res)->data = &(*res)[1];
-      memcpy ((char *)(*res)->data, rd[c].data, rd[c].data_size);
+      GNUNET_memcpy ((void *) (*res)->data,
+                     rd[c].data,
+                     rd[c].data_size);
       (*res)->data_size = rd[c].data_size;
       (*res)->expiration_time = rd[c].expiration_time;
       (*res)->flags = rd[c].flags;
@@ -513,7 +515,9 @@ merge_with_nick_records ( const struct GNUNET_GNSRECORD_Data *nick_rd,
     (*rd_res)[c] = rd2[c];
     (*rd_res)[c].data = (void *) &data[data_offset];
     // WTF?
-    memcpy ((void *) (*rd_res)[c].data, rd2[c].data, rd2[c].data_size);
+    GNUNET_memcpy ((void *) (*rd_res)[c].data,
+                   rd2[c].data,
+                   rd2[c].data_size);
     data_offset += (*rd_res)[c].data_size;
   }
   record_offset = rdc2;
@@ -523,9 +527,9 @@ merge_with_nick_records ( const struct GNUNET_GNSRECORD_Data *nick_rd,
     (*rd_res)[c+record_offset].expiration_time = latest_expiration;
     (*rd_res)[c+record_offset].data = (void *) &data[data_offset];
     // WTF?
-    memcpy ((void *) (*rd_res)[c+record_offset].data,
-            nick_rd[c].data,
-            nick_rd[c].data_size);
+    GNUNET_memcpy ((void *) (*rd_res)[c+record_offset].data,
+                   nick_rd[c].data,
+                   nick_rd[c].data_size);
     data_offset += (*rd_res)[c+record_offset].data_size;
   }
   GNUNET_assert (req == (sizeof (struct GNUNET_GNSRECORD_Data)) * (*rdc_res) + data_offset);
@@ -591,7 +595,7 @@ send_lookup_response (struct GNUNET_SERVER_NotificationContext *nc,
   zir_msg->rd_len = htons (rd_ser_len);
   zir_msg->private_key = *zone_key;
   name_tmp = (char *) &zir_msg[1];
-  memcpy (name_tmp, name, name_len);
+  GNUNET_memcpy (name_tmp, name, name_len);
   rd_ser = &name_tmp[name_len];
   GNUNET_GNSRECORD_records_serialize (res_count, res, rd_ser_len, rd_ser);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -893,8 +897,8 @@ handle_record_lookup (void *cls,
     llr_msg->found = ntohs (GNUNET_YES);
   else
     llr_msg->found = ntohs (GNUNET_NO);
-  memcpy (&llr_msg[1], name_tmp, name_len);
-  memcpy (&res_name[name_len], rlc.res_rd, rlc.rd_ser_len);
+  GNUNET_memcpy (&llr_msg[1], name_tmp, name_len);
+  GNUNET_memcpy (&res_name[name_len], rlc.res_rd, rlc.rd_ser_len);
 
   GNUNET_SERVER_notification_context_unicast (snc, client, &llr_msg->gns_header.header,
       GNUNET_NO);
@@ -1153,7 +1157,7 @@ handle_zone_to_name_it (void *cls,
   ztnr_msg->zone = *zone_key;
   name_tmp = (char *) &ztnr_msg[1];
   if (NULL != name)
-    memcpy (name_tmp, name, name_len);
+    GNUNET_memcpy (name_tmp, name, name_len);
   rd_tmp = &name_tmp[name_len];
   GNUNET_GNSRECORD_records_serialize (rd_count, rd, rd_ser_len, rd_tmp);
   ztn_ctx->success = GNUNET_OK;
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index afb7265d8..b8da654ce 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -992,7 +992,7 @@ GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h,
   msg->private_key = *pkey;
 
   name_tmp = (char *) &msg[1];
-  memcpy (name_tmp,
+  GNUNET_memcpy (name_tmp,
           label,
           name_len);
   rd_ser = &name_tmp[name_len];
@@ -1095,7 +1095,7 @@ GNUNET_NAMESTORE_records_lookup (struct GNUNET_NAMESTORE_Handle *h,
   msg->gns_header.r_id = htonl (qe->op_id);
   msg->zone = *pkey;
   msg->label_len = htonl (label_len);
-  memcpy (&msg[1],
+  GNUNET_memcpy (&msg[1],
           label,
           label_len);
   if (NULL == h->mq)
diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c
index 4356c3b93..36b045394 100644
--- a/src/namestore/plugin_namestore_flat.c
+++ b/src/namestore/plugin_namestore_flat.c
@@ -263,8 +263,8 @@ database_setup (struct Plugin *plugin)
                                     (char**)&entry->private_key);
       key_len = strlen (label) + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey);
       key = GNUNET_malloc (strlen (label) + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
-      memcpy (key, label, strlen (label));
-      memcpy (key+strlen(label),
+      GNUNET_memcpy (key, label, strlen (label));
+      GNUNET_memcpy (key+strlen(label),
               entry->private_key,
               sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
       GNUNET_CRYPTO_hash (key,
@@ -413,8 +413,8 @@ namestore_store_records (void *cls,
   rvalue = GNUNET_CRYPTO_random_u64 (GNUNET_CRYPTO_QUALITY_WEAK, UINT64_MAX);
   key_len = strlen (label) + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey);
   key = GNUNET_malloc (key_len);
-  memcpy (key, label, strlen (label));
-  memcpy (key+strlen(label),
+  GNUNET_memcpy (key, label, strlen (label));
+  GNUNET_memcpy (key+strlen(label),
           zone_key,
           sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
   GNUNET_CRYPTO_hash (key,
@@ -430,7 +430,7 @@ namestore_store_records (void *cls,
     GNUNET_asprintf (&entry->label,
                      label,
                      strlen (label));
-    memcpy (entry->private_key,
+    GNUNET_memcpy (entry->private_key,
             zone_key,
             sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
     entry->rvalue = rvalue;
@@ -443,7 +443,7 @@ namestore_store_records (void *cls,
       entry->record_data[i].flags = rd[i].flags;
       entry->record_data[i].data_size = rd[i].data_size;
       entry->record_data[i].data = GNUNET_malloc (rd[i].data_size);
-      memcpy ((char*)entry->record_data[i].data, rd[i].data, rd[i].data_size);
+      GNUNET_memcpy ((char*)entry->record_data[i].data, rd[i].data, rd[i].data_size);
     }
     return GNUNET_CONTAINER_multihashmap_put (plugin->hm,
                                               &hkey,
@@ -483,8 +483,8 @@ namestore_lookup_records (void *cls,
   }
   key_len = strlen (label) + sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey);
   key = GNUNET_malloc (key_len);
-  memcpy (key, label, strlen (label));
-  memcpy (key+strlen(label),
+  GNUNET_memcpy (key, label, strlen (label));
+  GNUNET_memcpy (key+strlen(label),
           zone,
           sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey));
   GNUNET_CRYPTO_hash (key,
diff --git a/src/namestore/plugin_namestore_postgres.c b/src/namestore/plugin_namestore_postgres.c
index 9118ca5cf..8ea6b43ad 100644
--- a/src/namestore/plugin_namestore_postgres.c
+++ b/src/namestore/plugin_namestore_postgres.c
@@ -228,7 +228,7 @@ namestore_postgres_store_records (void *cls,
     if (GNUNET_GNSRECORD_TYPE_PKEY == rd[i].record_type)
     {
       GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size);
-      memcpy (&pkey,
+      GNUNET_memcpy (&pkey,
               rd[i].data,
               rd[i].data_size);
       break;
@@ -363,7 +363,7 @@ get_record_and_call_iterator (struct Plugin *plugin,
     struct GNUNET_GNSRECORD_Data rd[record_count];
     char buf[label_len + 1];
 
-    memcpy (buf, label, label_len);
+    GNUNET_memcpy (buf, label, label_len);
     buf[label_len] = '\0';
     if (GNUNET_OK !=
         GNUNET_GNSRECORD_records_deserialize (data_size, data,
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index 3710a4820..e93f800c3 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -372,7 +372,7 @@ namestore_sqlite_store_records (void *cls,
     if (GNUNET_GNSRECORD_TYPE_PKEY == rd[i].record_type)
     {
       GNUNET_break (sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey) == rd[i].data_size);
-      memcpy (&pkey,
+      GNUNET_memcpy (&pkey,
               rd[i].data,
               rd[i].data_size);
       break;
diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c
index 78b6398c6..35d3595ce 100644
--- a/src/namestore/plugin_rest_namestore.c
+++ b/src/namestore/plugin_rest_namestore.c
@@ -744,7 +744,7 @@ namestore_create_cont (struct GNUNET_REST_RequestHandle *con,
     return;
   }
   term_data[handle->rest_handle->data_size] = '\0';
-  memcpy (term_data,
+  GNUNET_memcpy (term_data,
           handle->rest_handle->data,
           handle->rest_handle->data_size);
   data_js = json_loads (term_data,
diff --git a/src/namestore/test_namestore_api_zone_to_name.c b/src/namestore/test_namestore_api_zone_to_name.c
index 12bc870b4..ca33ee280 100644
--- a/src/namestore/test_namestore_api_zone_to_name.c
+++ b/src/namestore/test_namestore_api_zone_to_name.c
@@ -199,7 +199,7 @@ run (void *cls,
   rd.data_size = sizeof (struct GNUNET_CRYPTO_ShortHashCode);
   rd.data = GNUNET_malloc(sizeof (struct GNUNET_CRYPTO_ShortHashCode));
   rd.flags = 0;
-  memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode));
+  GNUNET_memcpy ((char *) rd.data, &s_zone_value, sizeof (struct GNUNET_CRYPTO_ShortHashCode));
   nsh = GNUNET_NAMESTORE_connect (cfg);
   GNUNET_break (NULL != nsh);