From afab3c41511219eb609181eb1062d53a4f7c2909 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Fri, 12 Mar 2004 21:26:45 +0000 Subject: [PATCH] Fix a martin segfault git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2411 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_zap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/channels/chan_zap.c b/channels/chan_zap.c index b8173e517f..c153063e91 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -3138,7 +3138,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) } 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 */