From: Corey Farrell Date: Sun, 5 Oct 2014 00:15:43 +0000 (+0000) Subject: chan_motif: Correct last commit to use ao2_cleanup to free format cap X-Git-Tag: 14.0.0-beta1~1595 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b0902caa445620af8bdb1c9dd222744426e94a3;p=thirdparty%2Fasterisk.git chan_motif: Correct last commit to use ao2_cleanup to free format cap This fix applies to 13 and trunk. ASTERISK-24384 #close Reported by: Corey Farrell Review: https://reviewboard.asterisk.org/r/4043/ ........ Merged revisions 424554 from http://svn.asterisk.org/svn/asterisk/branches/13 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@424555 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_motif.c b/channels/chan_motif.c index 0dcdf74552..ebc77f8f42 100644 --- a/channels/chan_motif.c +++ b/channels/chan_motif.c @@ -2759,7 +2759,7 @@ 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); + ao2_cleanup(jingle_tech.capabilities); jingle_tech.capabilities = NULL; return AST_MODULE_LOAD_DECLINE; } @@ -2794,7 +2794,7 @@ end: aco_info_destroy(&cfg_info); ao2_global_obj_release(globals); - ast_format_cap_destroy(jingle_tech.capabilities); + ao2_cleanup(jingle_tech.capabilities); jingle_tech.capabilities = NULL; return AST_MODULE_LOAD_FAILURE;