From: Date: December 17 2007 11:45am
Subject: bk commit into 4.1 tree (tnurnberg:1.2704) BUG#31752
List-Archive: http://lists.mysql.com/commits/40088
X-Bug: 31752
Message-Id: <200712171045.lBHAjCbQ019111@white.intern.koehntopp.de>

Below is the list of changes that have just been committed into a local
4.1 repository of tnurnberg. When tnurnberg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-17 11:45:10+01:00, tnurnberg@stripped +1 -0
  Bug#31752: check strmake() bounds
  
  fix test program

  client/mysqltest.c@stripped, 2007-12-17 11:45:09+01:00, tnurnberg@stripped +2 -2
    fix buffer off-by-ones in test program

diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c	2007-06-01 19:57:26 +02:00
+++ b/client/mysqltest.c	2007-12-17 11:45:09 +01:00
@@ -3067,7 +3067,7 @@ void do_get_file_name(struct st_command 
   if (*p)
     *p++= 0;
   command->last_argument= p;
-  strmake(dest, name, dest_max_len);
+  strmake(dest, name, dest_max_len - 1);
 }
 
 
@@ -6375,7 +6375,7 @@ int main(int argc, char **argv)
 
 	if (save_file[0])
 	{
-	  strmake(command->require_file, save_file, sizeof(save_file));
+	  strmake(command->require_file, save_file, sizeof(save_file) - 1);
 	  save_file[0]= 0;
 	}
 	run_query(cur_con, command, flags);