[Asterisk-cvs] asterisk/channels chan_zap.c,1.171.2.13,1.171.2.14

[markster at lists.digium.com]

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

Modified Files:
      Tag: v1-0_stable
	chan_zap.c 
Log Message:
Fix martin segfault


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.171.2.13
retrieving revision 1.171.2.14
diff -u -d -r1.171.2.13 -r1.171.2.14
--- chan_zap.c	11 Mar 2004 05:10:32 -0000	1.171.2.13
+++ chan_zap.c	12 Mar 2004 21:46:19 -0000	1.171.2.14
@@ -3127,7 +3127,7 @@
 					} else if (!p->subs[SUB_THREEWAY].owner) {
 						char callerid[256];
 						if (p->threewaycalling && !check_for_conference(p)) {
-							if (p->zaptrcallerid && p->owner)
+							if (p->zaptrcallerid && p->owner && p->owner->callerid)
 								strncpy(callerid, p->owner->callerid, sizeof(callerid) - 1);
 							/* XXX This section needs much more error checking!!! XXX */
 							/* Start a 3-way call if feasible */