Merge branch '10.5' into 10.6

1 files changed, 9 insertions, 6 deletions

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index ff9992de3b1..0f553cab3f3 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -6182,7 +6182,9 @@ int do_done(struct st_command *command)
     if (*cur_block->delim) 
     {
       /* Restore "old" delimiter after false if block */
-      strcpy (delimiter, cur_block->delim);
+      if (safe_strcpy(delimiter, sizeof(delimiter), cur_block->delim))
+        die("Delimiter too long, truncated");
+
       delimiter_length= strlen(delimiter);
     }
     /* Pop block from stack, goto next line */
@@ -6437,10 +6439,12 @@ void do_block(enum block_cmd cmd, struct st_command* command)
   if (cur_block->ok) 
   {
     cur_block->delim[0]= '\0';
-  } else
+  }
+  else
   {
     /* Remember "old" delimiter if entering a false if block */
-    strcpy (cur_block->delim, delimiter);
+    if (safe_strcpy(cur_block->delim, sizeof(cur_block->delim), delimiter))
+      die("Delimiter too long, truncated");
   }
   
   DBUG_PRINT("info", ("OK: %d", cur_block->ok));
@@ -11846,9 +11850,8 @@ static int setenv(const char *name, const char *value, int overwrite)
   char *envvar= (char *)malloc(buflen);
   if(!envvar)
     return ENOMEM;
-  strcpy(envvar, name);
-  strcat(envvar, "=");
-  strcat(envvar, value);
+
+  snprintf(envvar, buflen, "%s=%s", name, value);
   putenv(envvar);
   return 0;
 }