From: Date: November 27 2007 6:24pm
Subject: bk commit into 4.1 tree (tnurnberg:1.2699) BUG#32707
List-Archive: http://lists.mysql.com/commits/38642
X-Bug: 32707
Message-Id: <200711271724.lARHOQHf031170@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-11-27 18:24:24+01:00, tnurnberg@stripped +1 -0
  Bug#32707: misdimensioned buffer in protocol layer
  
  Miscalculation in protocol-layer: size buffer correctly so
  even really long error messages cannot overflow our buffer.

  sql/protocol.cc@stripped, 2007-11-27 18:24:24+01:00, tnurnberg@stripped +4 -1
    size buffer correctly so really long error messages cannot overflow it.

diff -Nrup a/sql/protocol.cc b/sql/protocol.cc
--- a/sql/protocol.cc	2006-11-13 11:28:50 +01:00
+++ b/sql/protocol.cc	2007-11-27 18:24:24 +01:00
@@ -56,7 +56,10 @@ void send_error(THD *thd, uint sql_errno
 {
 #ifndef EMBEDDED_LIBRARY 
   uint length;
-  char buff[MYSQL_ERRMSG_SIZE+2], *pos;
+  /*
+    buff[]: sql_errno:2 + ('#':1 + SQLSTATE_LENGTH:5) + MYSQL_ERRMSG_SIZE:512
+  */
+  char buff[2+1+SQLSTATE_LENGTH+MYSQL_ERRMSG_SIZE], *pos;
 #endif
   const char *orig_err= err;
   NET *net= &thd->net;