6 files changed, 18 insertions, 17 deletions

diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 25d9724fa..687a54bcd 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -374,9 +374,9 @@ tokenizer_cb (void *cls,
   if (0 != hostname_size)
   {
     hostname = GNUNET_malloc (hostname_size + 1);
-    (void) strncpy (hostname, ((char *) &msg[1]) + trusted_ip_size + 1,
-                    hostname_size);
-    hostname[hostname_size] = '\0';
+    GNUNET_strlcpy (hostname,
+                    ((char *) &msg[1]) + trusted_ip_size + 1,
+                    hostname_size + 1);
   }
   /* unset GNUNET_TESTING_PREFIX if present as it is more relevant for testbed */
   evstr = getenv (GNUNET_TESTING_PREFIX);
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 51460f65b..289e17349 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -541,13 +541,11 @@ handle_add_host (void *cls,
   if (0 != username_length)
   {
     username = GNUNET_malloc (username_length + 1);
-    strncpy (username, ptr, username_length);
+    GNUNET_strlcpy (username, ptr, username_length + 1);
     ptr += username_length;
   }
   hostname = GNUNET_malloc (hostname_length + 1);
-  strncpy (hostname,
-           ptr,
-           hostname_length);
+  GNUNET_strlcpy (hostname, ptr, hostname_length + 1);
   if (NULL == (host_cfg = GNUNET_TESTBED_extract_config_ (&msg->header)))
   {
     GNUNET_free_non_null (username);
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 98a4282df..4d6a4d446 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -1908,9 +1908,9 @@ handle_remote_overlay_connect (void *cls,
   rocc->a_id = msg->peer_identity;
   GNUNET_TESTING_peer_get_identity (peer->details.local.peer,
                                     &pid);
-  (void) strncpy (pid_str,
-                  GNUNET_i2s (&pid),
-                  15);
+  (void) GNUNET_strlcpy (pid_str,
+                         GNUNET_i2s (&pid),
+                         sizeof (pid_str));
   LOG_DEBUG ("0x%llx: Remote overlay connect %s to peer %s with hello size: %u\n",
              rocc->op_id,
              pid_str,
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 793ed4edd..ade1a93de 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -2014,8 +2014,9 @@ GNUNET_TESTBED_create_helper_init_msg_ (const char *trusted_ip,
   msg->config_size = htons (config_size);
   (void) strcpy ((char *) &msg[1], trusted_ip);
   if (0 != hostname_len)
-    (void) strncpy (((char *) &msg[1]) + trusted_ip_len + 1, hostname,
-                    hostname_len);
+    GNUNET_memcpy (&msg[1] + trusted_ip_len + 1,
+                   hostname,
+                   hostname_len);
   return msg;
 }
 
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 327f84f2a..6dbd99bc9 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -462,8 +462,9 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
       {
         size = pmatch[2].rm_eo - pmatch[2].rm_so;
         username = GNUNET_malloc (size + 1);
-        username[size] = '\0';
-        GNUNET_assert (NULL != strncpy (username, buf + pmatch[2].rm_so, size));
+        GNUNET_assert(0 != GNUNET_strlcpy (username,
+                                           buf + pmatch[2].rm_so,
+                                           size + 1));
       }
       if (-1 != pmatch[5].rm_so)
       {
@@ -471,8 +472,9 @@ GNUNET_TESTBED_hosts_load_from_file (const char *filename,
       }
       size = pmatch[3].rm_eo - pmatch[3].rm_so;
       hostname = GNUNET_malloc (size + 1);
-      hostname[size] = '\0';
-      GNUNET_assert (NULL != strncpy (hostname, buf + pmatch[3].rm_so, size));
+      GNUNET_assert(0 != GNUNET_strlcpy (hostname,
+                                         buf + pmatch[3].rm_so,
+                                         size + 1));
       LOG (GNUNET_ERROR_TYPE_DEBUG,
            "Successfully read host %s, port %d and user %s from file\n",
            (NULL == hostname) ? "NULL" : hostname,
diff --git a/src/testbed/testbed_helper.h b/src/testbed/testbed_helper.h
index fb5428cbe..472d07271 100644
--- a/src/testbed/testbed_helper.h
+++ b/src/testbed/testbed_helper.h
@@ -32,7 +32,7 @@ GNUNET_NETWORK_STRUCT_BEGIN
 /**
  * Initialization message for gnunet-helper-testbed to start testbed service
  */
-    struct GNUNET_TESTBED_HelperInit
+struct GNUNET_TESTBED_HelperInit
 {
   /**
    * Type is GNUNET_MESSAGE_TYPE_TESTBED_HELPER_INIT