From: Corey Farrell <git@cfware.com>
Date: Sun, 5 Oct 2014 00:02:39 +0000 (+0000)
Subject: chan_motif: Release format capabilities and config on module load error
X-Git-Tag: 14.0.0-beta1~1596
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cea12b9e8bac5aeebeab2d5ca06b8014a2a0331;p=thirdparty%2Fasterisk.git

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/
........

Merged revisions 424550 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 424551 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 424552 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424553 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index 2582a0eebe..0dcdf74552 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2759,6 +2759,8 @@ static int load_module(void)
 		ao2_ref(jingle_tech.capabilities, -1);
 		ast_log(LOG_ERROR, "Unable to read config file motif.conf. Module loaded but not running.\n");
 		aco_info_destroy(&cfg_info);
+		ast_format_cap_destroy(jingle_tech.capabilities);
+		jingle_tech.capabilities = NULL;
 		return AST_MODULE_LOAD_DECLINE;
 	}
 
@@ -2790,6 +2792,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;
 }