Fix a martin segfault

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2411 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index b8173e517ffea920fa7ac11a858c352f85d76191..c153063e915f3cc5f1c79501c5237576b1aedf1a 100755 (executable)
--- 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 */