merge 10.4 to 10.5

1 files changed, 5 insertions, 2 deletions

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index 33bd1b07ae9..3c878d4cb97 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -11178,13 +11178,16 @@ void replace_dynstr_append_mem(DYNAMIC_STRING *ds, const char *val, size_t len)
     {
       /* Convert to lower case, and do this first */
       char *c= lower;
-      for (const char *v= val;  *v;  v++)
+      for (const char *v= val, *end_v= v + len;  v < end_v;  v++)
         *c++= my_tolower(charset_info, *v);
       *c= '\0';
       /* Copy from this buffer instead */
     }
     else
-      memcpy(lower, val, len+1);
+    {
+      memcpy(lower, val, len);
+      lower[len]= 0;
+    }
     fix_win_paths(lower, len);
     val= lower;
   }