Kouhei Sutou
null+****@clear*****
Wed Jul 19 21:42:51 JST 2017
Kouhei Sutou 2017-07-19 21:42:51 +0900 (Wed, 19 Jul 2017) New Revision: b190bc004d9de137bea0883e258d9edbd9657c31 https://github.com/mroonga/mroonga/commit/b190bc004d9de137bea0883e258d9edbd9657c31 Message: Ensure freeing old mroonga_query_log_file value Modified files: ha_mroonga.cpp Modified: ha_mroonga.cpp (+5 -7) =================================================================== --- ha_mroonga.cpp 2017-07-19 21:42:13 +0900 (633370b) +++ ha_mroonga.cpp 2017-07-19 21:42:51 +0900 (60a8498) @@ -883,17 +883,15 @@ static void mrn_query_log_file_update(THD *thd, struct st_mysql_sys_var *var, new_query_log_file_name = normalized_new_value; } + char *old_query_log_file_name = *old_value_ptr; if (new_query_log_file_name) { -#ifdef MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR - char *old_query_log_file_name = *old_value_ptr; - *old_value_ptr = mrn_my_strdup(new_query_log_file_name, MYF(MY_WME)); - my_free(old_query_log_file_name); -#else - *old_value_ptr = mrn_my_strdup(new_query_log_file_name, MYF(MY_WME)); -#endif + *old_value_ptr = mrn_my_strdup(new_query_log_file_name, MYF(0)); } else { *old_value_ptr = NULL; } +#ifdef MRN_NEED_FREE_STRING_MEMALLOC_PLUGIN_VAR + my_free(old_query_log_file_name); +#endif DBUG_VOID_RETURN; } -------------- next part -------------- HTML����������������������������...Download