From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 4 Jun 2008 18:37:08 +0000 (+0000)
Subject: Merged revisions 120425 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~2080
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c73972e48d2d0d258aa5d57342a892d63699fbf8;p=thirdparty%2Fasterisk.git

Merged revisions 120425 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r120425 | tilghman | 2008-06-04 13:35:47 -0500 (Wed, 04 Jun 2008) | 6 lines

If we fail to setup the PRI request channel, don't continue, exit with an error.
(closes issue #11989)
 Reported by: Corydon76
 Patches:
       20080213__zap_memleak.diff.txt uploaded by Corydon76 (license 14)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@120426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 5187685e2d..daeb7cf503 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -2561,8 +2561,11 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
 		}
 		if (!(sr = pri_sr_new())) {
 			ast_log(LOG_WARNING, "Failed to allocate setup request channel %d\n", p->channel);
+			pri_destroycall(p->pri->pri, p->call);
+			p->call = NULL;
 			pri_rel(p->pri);
 			ast_mutex_unlock(&p->lock);
+			return -1;
 		}
 		if (p->bearer || (mysig == SIG_FXSKS)) {
 			if (p->bearer) {