[asterisk-commits] coreyfarrell: branch 13 r424552 - in /branches/13: ./ channels/chan_motif.c

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Sat Oct  4 19:01:53 2014
New Revision: 424552

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

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

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

Modified:
    branches/13/   (props changed)
    branches/13/channels/chan_motif.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/channels/chan_motif.c?view=diff&rev=424552&r1=424551&r2=424552
==============================================================================
--- branches/13/channels/chan_motif.c (original)
+++ branches/13/channels/chan_motif.c Sat Oct  4 19:01:53 2014
@@ -2759,6 +2759,8 @@
 		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 @@
 	}
 
 	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;
 }