Commit 5a0af835 authored by unknown's avatar unknown

Fix missing bounds check in string conversion.

Bump version number for security fix release.
parent 1f683a72
...@@ -7,7 +7,7 @@ AC_PREREQ(2.59) ...@@ -7,7 +7,7 @@ AC_PREREQ(2.59)
# Remember to also update version.c in ndb. # Remember to also update version.c in ndb.
# When changing major version number please also check switch statement # When changing major version number please also check switch statement
# in mysqlbinlog::check_master_version(). # 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_CONFIG_SRCDIR([sql/mysqld.cc])
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
# USTAR format gives us the possibility to store longer path names in # USTAR format gives us the possibility to store longer path names in
......
...@@ -4116,6 +4116,10 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)), ...@@ -4116,6 +4116,10 @@ my_wc_mb_filename(CHARSET_INFO *cs __attribute__((unused)),
{ {
int code; int code;
char hex[]= "0123456789abcdef"; char hex[]= "0123456789abcdef";
if (s >= e)
return MY_CS_TOOSMALL;
if (wc < 128 && filename_safe_char[wc]) if (wc < 128 && filename_safe_char[wc])
{ {
*s= (uchar) wc; *s= (uchar) wc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment