maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2850 knielsen@xxxxxxxxxxxxxxx	2010-04-29
      Fix missing bounds check in string conversion.
      Bump version number for security fix release.
      modified:
        configure.in
        strings/ctype-utf8.c

=== modified file 'configure.in'
--- a/configure.in	2010-03-04 08:03:07 +0000
+++ b/configure.in	2010-04-29 07:29:04 +0000
@@ -7,7 +7,7 @@ AC_PREREQ(2.59)
 # Remember to also update version.c in ndb.
 # When changing major version number please also check switch statement
 # in mysqlbinlog::check_master_version().
-AC_INIT([MariaDB Server], [5.1.44-MariaDB], [], [mysql])
+AC_INIT([MariaDB Server], [5.1.44a-MariaDB], [], [mysql])
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM
 # USTAR format gives us the possibility to store longer path names in

=== modified file 'strings/ctype-utf8.c'
--- a/strings/ctype-utf8.c	2010-03-30 12:36:49 +0000
+++ b/strings/ctype-utf8.c	2010-04-29 07:29:04 +0000
@@ -4116,6 +4116,10 @@ my_wc_mb_filename(CHARSET_INFO *cs __att
 {
   int code;
   char hex[]= "0123456789abcdef";
+
+  if (s >= e)
+    return MY_CS_TOOSMALL;
+
   if (wc < 128 && filename_safe_char[wc])
   {
     *s= (uchar) wc;