diff --git a/src/common/xcgroup_read_config.c b/src/common/xcgroup_read_config.c index 151d71355698ac1414cf53ba6d81d5305ae1719b..6e388106b1ee8ab3effbf578476fee57142e8d5c 100644 --- a/src/common/xcgroup_read_config.c +++ b/src/common/xcgroup_read_config.c @@ -123,6 +123,7 @@ static void conf_get_float (s_p_hashtbl_t *t, char *name, float *fp) return; if (str_to_float (str, fp) < 0) fatal ("cgroup.conf: Invalid value '%s' for %s", str, name); + xfree(str); } /* diff --git a/src/database/mysql_common.c b/src/database/mysql_common.c index bcdc12e56517d93b1dcf4626b04e443fddc2b1fd..4f55b5af939eca0c1b2ec4adabf5c75eea8b31a9 100644 --- a/src/database/mysql_common.c +++ b/src/database/mysql_common.c @@ -251,6 +251,7 @@ static int _mysql_make_table_current(mysql_conn_t *mysql_conn, char *table_name, if (!(result = mysql_db_query_ret(mysql_conn, query, 0))) { xfree(query); xfree(old_index); + FREE_NULL_LIST(keys_list); return SLURM_ERROR; } xfree(query); diff --git a/src/plugins/accounting_storage/mysql/as_mysql_assoc.c b/src/plugins/accounting_storage/mysql/as_mysql_assoc.c index 1bef5a2348309fb79beacdb2a98483fe54467de8..c09fb4594bbab25fcb28371823ad1ba85d5fa315 100644 --- a/src/plugins/accounting_storage/mysql/as_mysql_assoc.c +++ b/src/plugins/accounting_storage/mysql/as_mysql_assoc.c @@ -2981,6 +2981,7 @@ end_it: if (rc != SLURM_ERROR) { _make_sure_users_have_default(mysql_conn, added_user_list); + FREE_NULL_LIST(added_user_list); if (txn_query) { xstrcat(txn_query, ";"); @@ -3037,8 +3038,7 @@ end_it: list_destroy(assoc_list); } } else { - if (added_user_list) - list_destroy(added_user_list); + FREE_NULL_LIST(added_user_list); xfree(txn_query); reset_mysql_conn(mysql_conn); } diff --git a/src/slurmdbd/proc_req.c b/src/slurmdbd/proc_req.c index b353f0fdfeb48edb3a0bb3d99ea30c3cc66fa9bd..4bffdba122d6597c8b0cc9f9c298697ee3478a0e 100644 --- a/src/slurmdbd/proc_req.c +++ b/src/slurmdbd/proc_req.c @@ -3455,6 +3455,8 @@ static int _remove_res(slurmdbd_conn_t *slurmdbd_conn, pack16((uint16_t) DBD_GOT_LIST, *out_buffer); slurmdbd_pack_list_msg(&list_msg, slurmdbd_conn->rpc_version, DBD_GOT_LIST, *out_buffer); + FREE_NULL_LIST(list_msg.my_list); + return rc; }