summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2020-07-20 19:26:58 +0300
committerMonty <monty@mariadb.org>2020-07-23 10:54:33 +0300
commit46ffd47f422147cd748119eba19ad248bd7356db (patch)
tree6e92fada5847e2f0c28a1c0a70217503cec322ec
parentd55f8a249eb9f2687a74f95f04ffd125998358da (diff)
downloadmariadb-git-46ffd47f422147cd748119eba19ad248bd7356db.tar.gz
Fixed wrong free in comp_err
-rw-r--r--extra/comp_err.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c
index 6fe26c4e4be..5e1e042f6ed 100644
--- a/extra/comp_err.c
+++ b/extra/comp_err.c
@@ -66,6 +66,7 @@ const char *empty_string= ""; /* For empty states */
*/
const char *default_language= "eng";
+my_bool default_language_changed= 0;
uint er_offset= 1000;
my_bool info_flag= 0;
@@ -440,7 +441,8 @@ static void clean_up(struct languages *lang_head, struct errors *error_head)
struct errors *tmp_error, *next_error;
uint count, i;
- my_free((void*) default_language);
+ if (default_language_changed)
+ my_free((void*) default_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");
DBUG_RETURN(0);
}
+ default_language_changed= 1;
continue;
}