mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-25 09:45:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-10823 Certain unicode characters in hostname prevent mysqld from starting

Browse source 
Server uses gethostname() for the default base name for pid/log files.
If a character is not representable in current ANSI encoding, gethostname
replaces it with question mark. Thus, generated log file name would also
contain a question mark. However, Windows forbids certain characters in
filenames, among them '?'.

This is described in MSDN article https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx
At attempts to create the file via freopen() fails, thus server would not
be able to start.

The fix is to verify hostname and fall back to  "mysql", if
invalid characters are found.
This commit is contained in:
Vladislav Vaintroub 2016-09-23 18:55:44 +02:00
commit f1aefd9d75
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
sql/mysqld.cc
View file

@ -4167,6 +4167,8 @@ static int init_common_variables()
return 1;
}
opt_log_basename= const_cast<char *>("mysql");
if (gethostname(glob_hostname,sizeof(glob_hostname)) < 0)
{
/*
@ -4176,9 +4178,8 @@ static int init_common_variables()
strmake(glob_hostname, STRING_WITH_LEN("localhost"));
sql_print_warning("gethostname failed, using '%s' as hostname",
glob_hostname);
opt_log_basename= const_cast<char *>("mysql");
}
else
else if (is_filename_allowed(glob_hostname, strlen(glob_hostname), FALSE))
opt_log_basename= glob_hostname;
strmake(pidfile_name, opt_log_basename, sizeof(pidfile_name)-5);
@ -8970,9 +8971,10 @@ mysqld_get_one_option(int optid, const struct my_option *opt, char *argument)
case (int) OPT_LOG_BASENAME:
{
if (opt_log_basename[0] == 0 || strchr(opt_log_basename, FN_EXTCHAR) ||
strchr(opt_log_basename,FN_LIBCHAR))
strchr(opt_log_basename,FN_LIBCHAR) ||
!is_filename_allowed(opt_log_basename, strlen(opt_log_basename), FALSE))
{
sql_print_error("Wrong argument for --log-basename. It can't be empty or contain '.' or '" FN_DIRSEP "'");
sql_print_error("Wrong argument for --log-basename. It can't be empty or contain '.' or '" FN_DIRSEP "'. It must be valid filename.");
return 1;
}
if (log_error_file_ptr != disabled_my_option)