From 524510f4f6fee7655df178a4eb6de893d18ffffb Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Wed, 18 Nov 2020 10:39:31 +0000 Subject: [PATCH] Fix some plugin memory not being freed on exit. --- src/plugin.c | 4 ---- src/security.c | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/plugin.c b/src/plugin.c index 8165b5fe..c55c4fd6 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -321,9 +321,5 @@ int mosquitto_callback_unregister( break; } - if(check_callback_exists(*cb_base, cb_func)){ - return MOSQ_ERR_ALREADY_EXISTS; - } - return remove_callback(*cb_base, cb_func); } diff --git a/src/security.c b/src/security.c index 6932b8d1..b20898dd 100644 --- a/src/security.c +++ b/src/security.c @@ -546,7 +546,9 @@ static int security__cleanup_single(struct mosquitto__security_options *opts, bo int rc; for(i=0; iauth_plugin_config_count; i++){ - if(opts->auth_plugin_configs[i].plugin.version == 4){ + if(opts->auth_plugin_configs[i].plugin.version == 5){ + rc = MOSQ_ERR_SUCCESS; + }else if(opts->auth_plugin_configs[i].plugin.version == 4){ rc = opts->auth_plugin_configs[i].plugin.security_cleanup_v4( opts->auth_plugin_configs[i].plugin.user_data, opts->auth_plugin_configs[i].options,