Merge lp:~mordred/drizzle/bug405501 into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

[Monty Taylor (mordred)]

Fixed a buffer overrun.

[Jay Pipes (jaypipes)]

Merging into a captain branch with Trond's bug fix for 416554, since Diego's bug fixes have a little issue right now...

=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2009-07-20 18:10:47 +0000
+++ client/drizzle.cc	2009-08-29 19:30:29 +0000
@@ -1144,8 +1144,6 @@
 
 int main(int argc,char *argv[])
 {
-  char buff[80];
-
 #if defined(ENABLE_NLS)
 # if defined(HAVE_LOCALE_H)
   setlocale(LC_ALL, "");
@@ -1317,10 +1315,9 @@
       sprintf(histfile_tmp, "%s.TMP", histfile);
     }
   }
-  sprintf(buff, "%s",
-          _("Type 'help;' or '\\h' for help. Type '\\c' to clear the buffer.\n"));
 
-  put_info(buff,INFO_INFO,0,0);
+  put_info(_("Type 'help;' or '\\h' for help. "
+             "Type '\\c' to clear the buffer.\n"),INFO_INFO,0,0);
   status.exit_status= read_and_execute(!status.batch);
   if (opt_outfile)
     end_tee();
@@ -1986,7 +1983,7 @@
                         bool *ml_comment)
 {
   unsigned char inchar;
-  char buff[80], *pos, *out;
+  char *pos, *out;
   COMMANDS *com;
   bool need_space= 0;
   bool ss_comment= 0;
@@ -2076,8 +2073,12 @@
       }
       else
       {
-        sprintf(buff,_("Unknown command '\\%c'."),inchar);
-        if (put_info(buff,INFO_ERROR,0,0) > 0)
+        string buff(_("Unknown command: "));
+        buff.push_back('\'');
+        buff.push_back(inchar);
+        buff.push_back('\'');
+        buff.push_back('.');
+        if (put_info(buff.c_str(),INFO_ERROR,0,0) > 0)
           return(1);
         *out++='\\';
         *out++=(char) inchar;