From 4d1c38ef374a80632135e8fe3b125a86c23eb6fc Mon Sep 17 00:00:00 2001
From: Corey Farrell <git@cfware.com>
Date: Sat, 4 Oct 2014 23:59:45 +0000
Subject: [PATCH] chan_motif: Release format capabilities and config on module
load error
ASTERISK-24384 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4043/
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@424550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_motif.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index a197dc700e..313c66cf2b 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2564,6 +2564,8 @@ static int load_module(void)
if (aco_process_config(&cfg_info, 0)) {
ast_log(LOG_ERROR, "Unable to read config file motif.conf. Not loading module.\n");
aco_info_destroy(&cfg_info);
+ ast_format_cap_destroy(jingle_tech.capabilities);
+ jingle_tech.capabilities = NULL;
return AST_MODULE_LOAD_DECLINE;
}
@@ -2594,6 +2596,10 @@ end:
}
aco_info_destroy(&cfg_info);
+ ao2_global_obj_release(globals);
+
+ ast_format_cap_destroy(jingle_tech.capabilities);
+ jingle_tech.capabilities = NULL;
return AST_MODULE_LOAD_FAILURE;
}
--
GitLab