Revamp copyString to use memcpy.

Also make it allocate less memory in general. Signed-off-by: Chris Lalancette <[email protected]>
ros · Oct 23, 2023 · e87e66b · e87e66b
1 parent 8a0b831
commit e87e66b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/smclib/include/smclib/statemap.hpp b/smclib/include/smclib/statemap.hpp
@@ -84,9 +84,13 @@ inline char * copyString(const char * s)
 {
   char * retval = NULL;
   if (s != NULL) {
-    retval = new char[MAX_NAME_LEN + 1];
-    retval[MAX_NAME_LEN] = '\0';
-    (void) std::strncpy(retval, s, MAX_NAME_LEN);
+    size_t copy_len = strlen(s);
+    if (copy_len > MAX_NAME_LEN) {
+      copy_len = MAX_NAME_LEN;
+    }
+    retval = new char[copy_len + 1];
+    memcpy(retval, s, copy_len);
+    retval[copy_len] = '\0';
   }
 
   return retval;