From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Feb 2014 17:25:49 +0000 (-0500)
Subject: Use the right functions; strncpy is usually not the answer
X-Git-Tag: tor-0.2.5.2-alpha~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa3c8c1397beff01fca186f176cd9fe1fa528aed;p=thirdparty%2Ftor.git

Use the right functions; strncpy is usually not the answer
---

diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c
index cbdc4a72b5..600e6a89d4 100644
--- a/src/test/test_nodelist.c
+++ b/src/test/test_nodelist.c
@@ -47,9 +47,9 @@ test_nodelist_node_get_verbose_nickname_not_named(void *arg)
   memset(&mock_rs, 0, sizeof(routerstatus_t));
 
   /* verbose nickname should use ~ instead of = for unnamed routers */
-  strncpy(mock_rs.nickname, "TestOR", 6);
+  strlcpy(mock_rs.nickname, "TestOR", sizeof(mock_rs.nickname));
   mock_node.rs = &mock_rs;
-  strncpy(mock_node.identity,
+  memcpy(mock_node.identity,
           "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
           "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA",
           DIGEST_LEN);