kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 08:49:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1445 in FS/freeswitch from ~PRAVEEN_KUMAR/freeswitch:bugfix/FS-10805-memory-leak-in-mod_amqp to master

Browse Source 
* commit '97d6bee3fcac17080775576b140d041d97ccd411':
  FS-10805: Memory Leak fix in mod_amqp
This commit is contained in:
Mike Jerris 2017-11-30 20:26:51 +00:00
commit 2dc4d712fe
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mod/event_handlers/mod_amqp/mod_amqp.c
View File

@ -86,7 +86,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_amqp_load)
*/ */
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_amqp_shutdown) SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_amqp_shutdown)
{ {
switch_hash_index_t *hi; switch_hash_index_t *hi = NULL;
mod_amqp_producer_profile_t *producer; mod_amqp_producer_profile_t *producer;
mod_amqp_command_profile_t *command; mod_amqp_command_profile_t *command;
mod_amqp_logging_profile_t *logging; mod_amqp_logging_profile_t *logging;
@ -94,22 +94,26 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_amqp_shutdown)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Mod starting shutting down\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Mod starting shutting down\n");
switch_event_unbind_callback(mod_amqp_producer_event_handler); switch_event_unbind_callback(mod_amqp_producer_event_handler);
while ((hi = switch_core_hash_first(mod_amqp_globals.producer_hash))) { while ((hi = switch_core_hash_first_iter(mod_amqp_globals.producer_hash, hi))) {
switch_core_hash_this(hi, NULL, NULL, (void **)&producer); switch_core_hash_this(hi, NULL, NULL, (void **)&producer);
mod_amqp_producer_destroy(&producer); mod_amqp_producer_destroy(&producer);
} }
while ((hi = switch_core_hash_first(mod_amqp_globals.command_hash))) { while ((hi = switch_core_hash_first_iter(mod_amqp_globals.command_hash, hi))) {
switch_core_hash_this(hi, NULL, NULL, (void **)&command); switch_core_hash_this(hi, NULL, NULL, (void **)&command);
mod_amqp_command_destroy(&command); mod_amqp_command_destroy(&command);
} }
switch_log_unbind_logger(mod_amqp_logging_recv); switch_log_unbind_logger(mod_amqp_logging_recv);
while ((hi = switch_core_hash_first(mod_amqp_globals.logging_hash))) { while ((hi = switch_core_hash_first_iter(mod_amqp_globals.logging_hash, hi))) {
switch_core_hash_this(hi, NULL, NULL, (void **)&logging); switch_core_hash_this(hi, NULL, NULL, (void **)&logging);
mod_amqp_logging_destroy(&logging); mod_amqp_logging_destroy(&logging);
} }
switch_core_hash_destroy(&(mod_amqp_globals.producer_hash));
switch_core_hash_destroy(&(mod_amqp_globals.command_hash));
switch_core_hash_destroy(&(mod_amqp_globals.logging_hash));
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Mod finished shutting down\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Mod finished shutting down\n");
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }