From: Automerge script Date: Mon, 30 Jul 2012 17:24:16 +0000 (+0000) Subject: Merged revisions 370564 via svnmerge from X-Git-Tag: 10.8.0-digiumphones-rc1~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5a26ce601e630c2821d6f14288aea1e851e3ae8;p=thirdparty%2Fasterisk.git Merged revisions 370564 via svnmerge from file:///srv/subversion/repos/asterisk/branches/10 ................ r370564 | rmudgett | 2012-07-30 11:49:12 -0500 (Mon, 30 Jul 2012) | 5 lines Release B channel allocation on error path in chan_misdn. ........ Merged revisions 370563 from http://svn.asterisk.org/svn/asterisk/branches/1.8 ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@370584 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index a985164824..f7eec9ccfe 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -8000,6 +8000,7 @@ static struct ast_channel *misdn_request(const char *type, struct ast_format_cap /* create ast_channel and link all the objects together */ cl = chan_list_init(ORG_AST); if (!cl) { + misdn_lib_release(newbc); ast_log(LOG_ERROR, "Could not create call record for Dial(%s)\n", dial_str); return NULL; } @@ -8008,6 +8009,7 @@ static struct ast_channel *misdn_request(const char *type, struct ast_format_cap ast = misdn_new(cl, AST_STATE_RESERVED, args.ext, NULL, cap, requestor ? requestor->linkedid : NULL, port, channel); if (!ast) { chan_list_unref(cl, "Failed to create a new channel"); + misdn_lib_release(newbc); ast_log(LOG_ERROR, "Could not create Asterisk channel for Dial(%s)\n", dial_str); return NULL; }