diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-12 21:26:45 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-03-12 21:26:45 +0000 |
| commit | 894a6228fe7ecc38bcc2f4cbe349b965f29421a4 (patch) | |
| tree | 233cd94dbae5463dfec51e1d54767458da3cc5a2 /channels | |
| parent | 037b8a6ad8e6f07952f9aa2e15fbb08008f88825 (diff) | |
Fix a martin segfault
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2411 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rwxr-xr-x | channels/chan_zap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index b8173e517..c153063e9 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 */ |