summaryrefslogtreecommitdiff
path: root/sql/unireg.cc
diff options
context:
space:
mode:
authortnurnberg@mysql.com/white.intern.koehntopp.de <>2007-12-06 11:48:27 +0100
committertnurnberg@mysql.com/white.intern.koehntopp.de <>2007-12-06 11:48:27 +0100
commitdddced964b7d3662f6bec97dc8a21f598a4b3ec7 (patch)
treec436358ed1e1ffba482ad6d92916f625847fb212 /sql/unireg.cc
parent1a95ed1df2bdd26444a973e07ffd84c045deb734 (diff)
downloadmariadb-git-dddced964b7d3662f6bec97dc8a21f598a4b3ec7.tar.gz
Bug#31752: check strmake() bounds
post-fixes: prevent semi-related overflow, additional comments
Diffstat (limited to 'sql/unireg.cc')
-rw-r--r--sql/unireg.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/unireg.cc b/sql/unireg.cc
index 795198fc55f..dcb49bc1766 100644
--- a/sql/unireg.cc
+++ b/sql/unireg.cc
@@ -141,6 +141,11 @@ bool mysql_create_frm(THD *thd, my_string file_name,
60);
forminfo[46]=(uchar) strlen((char*)forminfo+47); // Length of comment
#ifdef EXTRA_DEBUG
+ /*
+ EXTRA_DEBUG causes strmake() to initialize its buffer behind the
+ payload with a magic value to detect wrong buffer-sizes. We
+ explicitly zero that segment again.
+ */
memset((char*) forminfo+47 + forminfo[46], 0, 61 - forminfo[46]);
#endif