diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2008-10-10 19:01:11 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2008-10-10 19:01:11 +0000 |
| commit | 7dece2bbc3b7679f9c56da6084ebd368871cffea (patch) | |
| tree | bba83f62a3720c4f8d8cdd3e1fca6aa8b938e0e1 /databases/mysql41-server/files/patch-sql::mysqld.cc | |
| parent | Update mysql entries. (diff) | |
Fix for CVE-2008-2079.
PR: ports/127731
Submitted by: Andrew Daugherity <adaugherity@tamu.edu>
Notes
Notes:
svn path=/head/; revision=221402
Diffstat (limited to 'databases/mysql41-server/files/patch-sql::mysqld.cc')
| -rw-r--r-- | databases/mysql41-server/files/patch-sql::mysqld.cc | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/databases/mysql41-server/files/patch-sql::mysqld.cc b/databases/mysql41-server/files/patch-sql::mysqld.cc index e79f985fcb69..69c124fa1e70 100644 --- a/databases/mysql41-server/files/patch-sql::mysqld.cc +++ b/databases/mysql41-server/files/patch-sql::mysqld.cc @@ -9,3 +9,24 @@ #include <syslog.h> #ifdef NEED_SYS_SYSLOG_H #include <sys/syslog.h> +--- sql/mysqld.cc 2007-11-29 10:52:36 +0000 ++++ sql/mysqld.cc 2008-02-29 09:55:00 +0000 +@@ -390,6 +390,7 @@ + char compiled_default_collation_name[]= MYSQL_DEFAULT_COLLATION_NAME; + char *language_ptr, *default_collation_name, *default_character_set_name; + char mysql_data_home_buff[2], *mysql_data_home=mysql_real_data_home; ++char mysql_unpacked_real_data_home[FN_REFLEN]; + struct passwd *user_info; + char server_version[SERVER_VERSION_LENGTH]; + char *mysqld_unix_port, *opt_mysql_tmpdir; +@@ -6896,6 +6897,9 @@ + pos[1]= 0; + } + convert_dirname(mysql_real_data_home,mysql_real_data_home,NullS); ++ (void) fn_format(buff, mysql_real_data_home, "", "", ++ (MY_RETURN_REAL_PATH|MY_RESOLVE_SYMLINKS)); ++ (void) unpack_dirname(mysql_unpacked_real_data_home, buff); + convert_dirname(language,language,NullS); + (void) my_load_path(mysql_home,mysql_home,""); // Resolve current dir + (void) my_load_path(mysql_real_data_home,mysql_real_data_home,mysql_home); + |