From 5228f5d47a10d9194297a31bf4cf7dbbade6c868 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Thu, 20 Aug 2020 09:03:45 +1000
Subject: Ensure result buffer termination in String_cat utility routine

---
 StringUtils.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/StringUtils.c b/StringUtils.c
index 0578cdea..84b69b64 100644
--- a/StringUtils.c
+++ b/StringUtils.c
@@ -30,8 +30,9 @@ char* String_cat(const char* s1, const char* s2) {
    int l1 = strlen(s1);
    int l2 = strlen(s2);
    char* out = xMalloc(l1 + l2 + 1);
-   strncpy(out, s1, l1);
-   strncpy(out+l1, s2, l2+1);
+   memcpy(out, s1, l1);
+   memcpy(out+l1, s2, l2+1);
+   out[l1 + l2] = '\0';
    return out;
 }
 
-- 
cgit v1.2.3