From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 3 Dec 2004 00:11:21 +0000 (+0000)
Subject: doing <flash> *0 while on fxs causes Asterisk to crash (bug 2963)
X-Git-Tag: 1.0.11.1~359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65d6be272dc32a99e4263e2eef1c8d10ac320e05;p=thirdparty%2Fasterisk.git

doing <flash> *0 while on fxs causes Asterisk to crash (bug 2963)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@4376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/CHANGES b/CHANGES
index a205d7ae38..804c475df3 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
+ -- chan_zap
+    -- seg fault fix
  -- rtp
-    -- fix for a seg fault
+    -- seg fault fix
  -- chan_sip
     -- fix to prevent seg fault when attempting a transfer
     -- fix bug with supervised transfers
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 6745575a6a..eb5a60a888 100755
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5039,9 +5039,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 && nbridge->bridge) pbridge = nbridge->bridge->pvt->pvt;
-				if (nbridge && 
-				    (!strcmp(nbridge->type,"Zap")) &&
+				if (nbridge && nbridge->bridge) 
+					pbridge = nbridge->bridge->pvt->pvt;
+				if (nbridge && pbridge && 
+				    (!strcmp(nbridge->type,"Zap")) && 
+					(!strcmp(nbridge->bridge->type, "Zap")) &&
 				    ISTRUNK(pbridge)) {
 					int func = ZT_FLASH;
 					/* Clear out the dial buffer */