[Asterisk-cvs] asterisk/channels chan_zap.c,1.344.2.7,1.344.2.8

[russell at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv18020/channels

Modified Files:
      Tag: v1-0
	chan_zap.c 
Log Message:
doing <flash> *0 while on fxs causes Asterisk to crash (bug 2963) 


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.344.2.7
retrieving revision 1.344.2.8
diff -u -d -r1.344.2.7 -r1.344.2.8
--- chan_zap.c	27 Oct 2004 14:41:55 -0000	1.344.2.7
+++ chan_zap.c	3 Dec 2004 00:11:21 -0000	1.344.2.8
@@ -5039,9 +5039,11 @@
 					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 */