mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
Fix a martin segfault
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2411 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -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 */
|
||||
|
Reference in New Issue
Block a user