From: Mark Spencer <markster@digium.com>
Date: Wed, 1 Dec 2004 04:35:34 +0000 (+0000)
Subject: Make sure we really have a bridged channel (bug #2963)
X-Git-Tag: 1.2.0-beta1~1734
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34e56e86757e2093df3ffcc523f02b76fe50187e;p=thirdparty%2Fasterisk.git

Make sure we really have a bridged channel (bug #2963)


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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 6227dd0268..0c407424ad 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5174,9 +5174,11 @@ static void *ss_thread(void *data)
 					p->subs[SUB_THREEWAY].owner;
 				struct zt_pvt *pbridge = NULL;
 				  /* set up the private struct of the bridged one, if any */
-				if (nbridge && ast_bridged_channel(nbridge)) pbridge = ast_bridged_channel(nbridge)->pvt->pvt;
-				if (nbridge && 
-				    (!strcmp(nbridge->type,"Zap")) &&
+				if (nbridge && ast_bridged_channel(nbridge)) 
+					pbridge = ast_bridged_channel(nbridge)->pvt->pvt;
+				if (nbridge && pbridge && 
+				    (!strcmp(nbridge->type,"Zap")) && 
+					(!strcmp(ast_bridged_channel(nbridge)->type, "Zap")) &&
 				    ISTRUNK(pbridge)) {
 					int func = ZT_FLASH;
 					/* Clear out the dial buffer */