From a61c1906688a8ad367634328e3f413df5b62b6c0 Mon Sep 17 00:00:00 2001
From: Roman Nozdrin <roman.nozdrin@mariadb.com>
Date: Tue, 9 Jun 2020 10:45:51 +0000
Subject: [PATCH] MCOL-641 Remove memset from group_concat.

---
 dbcon/joblist/groupconcat.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dbcon/joblist/groupconcat.cpp b/dbcon/joblist/groupconcat.cpp
index 01f0a6c6b..942cd254f 100644
--- a/dbcon/joblist/groupconcat.cpp
+++ b/dbcon/joblist/groupconcat.cpp
@@ -939,8 +939,10 @@ void GroupConcatOrderBy::getResult(uint8_t* buff, const string& sep)
     }
 
     size_t resultSize = oss.str().size();
+    resultSize = (resultSize > fGroupConcatLen) ? fGroupConcatLen : resultSize;
     fOutputString.reset(new uint8_t[resultSize + 2]);
-    memset(fOutputString.get(), 0, resultSize + 2);
+    fOutputString[resultSize] = '\0';
+    fOutputString[resultSize + 1] = '\0';
 
     strncpy((char*)fOutputString.get(),
         oss.str().c_str(), resultSize);