[Asterisk-cvs] asterisk/channels chan_zap.c,1.188,1.189

[markster at lists.digium.com]

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

Modified Files:
	chan_zap.c 
Log Message:
Fix a martin segfault


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- chan_zap.c	11 Mar 2004 18:00:08 -0000	1.188
+++ chan_zap.c	12 Mar 2004 21:26:45 -0000	1.189
@@ -3138,7 +3138,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 */