[svn-commits] coreyfarrell: branch 11 r424550 - /branches/11/channels/chan_motif.c

[SVN commits to the Digium repositories]

Author: coreyfarrell
Date: Sat Oct  4 18:59:45 2014
New Revision: 424550

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424550
Log:
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/

Modified:
    branches/11/channels/chan_motif.c

Modified: branches/11/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/channels/chan_motif.c?view=diff&rev=424550&r1=424549&r2=424550
==============================================================================
--- branches/11/channels/chan_motif.c (original)
+++ branches/11/channels/chan_motif.c Sat Oct  4 18:59:45 2014
@@ -2564,6 +2564,8 @@
 	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 @@
 	}
 
 	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;
 }