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

Fixed wrong free in comp_err

Browse Source
This commit is contained in:
Monty 2020-07-20 19:26:58 +03:00
parent d55f8a249e
commit 46ffd47f42
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extra/comp_err.c
View File

@ -66,6 +66,7 @@ const char *empty_string= ""; /* For empty states */
*/ */
const char *default_language= "eng"; const char *default_language= "eng";
my_bool default_language_changed= 0;
uint er_offset= 1000; uint er_offset= 1000;
my_bool info_flag= 0; my_bool info_flag= 0;
@ -440,6 +441,7 @@ static void clean_up(struct languages *lang_head, struct errors *error_head)
struct errors *tmp_error, *next_error; struct errors *tmp_error, *next_error;
uint count, i; uint count, i;
if (default_language_changed)
my_free((void*) default_language); my_free((void*) default_language);
for (tmp_lang= lang_head; tmp_lang; tmp_lang= next_language) for (tmp_lang= lang_head; tmp_lang; tmp_lang= next_language)
@ -562,6 +564,7 @@ static uint parse_input_file(const char *file_name, struct errors **top_error,
"Failed to parse the default language line. Aborting\n"); "Failed to parse the default language line. Aborting\n");
DBUG_RETURN(0); DBUG_RETURN(0);
} }
default_language_changed= 1;
continue; continue;
} }