Author: coreyfarrell Date: Sat Oct 4 19:01:03 2014 New Revision: 424551 URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=424551 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 Modified: branches/12/ (props changed) branches/12/channels/chan_motif.c Propchange: branches/12/ ------------------------------------------------------------------------------ Binary property 'branch-11-merged' - no diff available. Modified: branches/12/channels/chan_motif.c URL: http://svnview.digium.com/svn/asterisk/branches/12/channels/chan_motif.c?view=diff&rev=424551&r1=424550&r2=424551 ============================================================================== --- branches/12/channels/chan_motif.c (original) +++ branches/12/channels/chan_motif.c Sat Oct 4 19:01:03 2014 @@ -2742,6 +2742,8 @@ if (aco_process_config(&cfg_info, 0)) { 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; } @@ -2772,6 +2774,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; } -- _____________________________________________________________________ -- Bandwidth and Colocation Provided by http://www.api-digital.com -- svn-commits mailing list To UNSUBSCRIBE or update options visit: http://lists.digium.com/mailman/listinfo/svn-commits
