1 files changed, 4 insertions, 2 deletions
diff --git a/snag/util.c b/snag/util.c
index 57a31a4..9a962b0 100644
--- a/snag/util.c
+++ b/snag/util.c
@@ -56,9 +56,11 @@ char* vastrcat_(int dummy, ...) {
     if (!output) return NULL;
 	char* p = output;
     while ((arg = va_arg(args, char*))) {
-		memcpy(p, arg, strlen(arg));
-		p += strlen(arg);
+		size_t alen = strlen(arg);
+		memcpy(p, arg, alen);
+		p += alen;
     }
+	output[len] = '\0';
     va_end(args2);
 
 	return output;