1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-4505 Buffer overrun when processing --log-bin parameter without file name

Browse Source 
because --log-bin sets opt_bin_logname to ""
(same for any OPT_ARG GET_STR (or GET_STR_ALLOC) option)
This commit is contained in:
Sergei Golubchik 2013-05-13 15:49:48 +02:00
parent 7642154725
commit 3aa50f64bb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysqld.cc
View File

@ -4253,11 +4253,13 @@ will be ignored as the --log-bin option is not defined.");
} }
#endif #endif
DBUG_ASSERT(!opt_bin_log || opt_bin_logname);
if (opt_bin_log) if (opt_bin_log)
{ {
/* Reports an error and aborts, if the --log-bin's path /* Reports an error and aborts, if the --log-bin's path
is a directory.*/ is a directory.*/
if (opt_bin_logname && if (opt_bin_logname[0] &&
opt_bin_logname[strlen(opt_bin_logname) - 1] == FN_LIBCHAR) opt_bin_logname[strlen(opt_bin_logname) - 1] == FN_LIBCHAR)
{ {
sql_print_error("Path '%s' is a directory name, please specify \ sql_print_error("Path '%s' is a directory name, please specify \
@ -4279,7 +4281,7 @@ a file name for --log-bin-index option", opt_binlog_index_name);
char buf[FN_REFLEN]; char buf[FN_REFLEN];
const char *ln; const char *ln;
ln= mysql_bin_log.generate_name(opt_bin_logname, "-bin", 1, buf); ln= mysql_bin_log.generate_name(opt_bin_logname, "-bin", 1, buf);
if (!opt_bin_logname && !opt_binlog_index_name) if (!opt_bin_logname[0] && !opt_binlog_index_name)
{ {
/* /*
User didn't give us info to name the binlog index file. User didn't give us info to name the binlog index file.