replace use of strcat() where the string offset is known.

also correct bad logic with converting a textblock to 3d-text, bytes-vs-number of chars wasn't handled right.

1 files changed, 11 insertions, 8 deletions

diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index cb0d4ae307d..3de57ccb54f 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -87,15 +87,18 @@ char *BLI_strdup(const char *str)
  */
 char *BLI_strdupcat(const char *__restrict str1, const char *__restrict str2)
 {
-	size_t len;
-	char *n;
-	
-	len = strlen(str1) + strlen(str2);
-	n = MEM_mallocN(len + 1, "strdupcat");
-	strcpy(n, str1);
-	strcat(n, str2);
+	/* include the NULL terminator of str2 only */
+	const size_t str1_len = strlen(str1);
+	const size_t str2_len = strlen(str2) + 1;
+	char *str, *s;
 	
-	return n;
+	str = MEM_mallocN(str1_len + str2_len, "strdupcat");
+	s = str;
+
+	memcpy(s, str1, str1_len); s += str1_len;
+	memcpy(s, str2, str2_len);
+
+	return str;
 }
 
 /**