database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-05 13:16:09 +03:00
Code Activity

Fix possible memory overrun when reading broken character set files

Browse Source
This commit is contained in:
monty@mashka.mysql.fi
2003-04-26 17:57:19 +03:00
parent 1621dd9818
commit f88097eee9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/charset.c
View File

@@ -85,7 +85,7 @@ static my_bool get_word(struct simpleconfig_buf_st *fb, char *buf)
endptr = fb->buf; endptr = fb->buf;
} }
while (!isspace(*endptr)) while (*endptr && !isspace(*endptr))
*buf++= *endptr++; *buf++= *endptr++;
*buf=0; *buf=0;
fb->p = endptr; fb->p = endptr;

2
sql/mysqld.cc
View File

@@ -785,7 +785,7 @@ void clean_up(bool print_message)
if (!opt_bootstrap) if (!opt_bootstrap)
(void) my_delete(pidfile_name,MYF(0)); // This may not always exist (void) my_delete(pidfile_name,MYF(0)); // This may not always exist
#endif #endif
if (print_message) if (print_message && errmesg)
sql_print_error(ER(ER_SHUTDOWN_COMPLETE),my_progname); sql_print_error(ER(ER_SHUTDOWN_COMPLETE),my_progname);
x_free((gptr) my_errmsg[ERRMAPP]); /* Free messages */ x_free((gptr) my_errmsg[ERRMAPP]); /* Free messages */
my_thread_end(); my_thread_end();