diff options
| author | Matthew Fredrickson <creslin@digium.com> | 2005-09-06 17:50:55 +0000 |
|---|---|---|
| committer | Matthew Fredrickson <creslin@digium.com> | 2005-09-06 17:50:55 +0000 |
| commit | 7348cba9c796f68b3980dda98b2c260765bfe001 (patch) | |
| tree | 2f9afcc870ce9fdb03c79a08a6618f55eca9c709 /channels/chan_zap.c | |
| parent | 4daf98741a2eccac58aeb3264878131e602dde90 (diff) | |
Fixed possible hangup race condition that would lead to segfualt with hangups.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
| -rwxr-xr-x | channels/chan_zap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 0222adf83..6bf8f6398 100755 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -2347,6 +2347,7 @@ static int zt_hangup(struct ast_channel *ast) icause = atoi(cause); } pri_hangup(p->pri->pri, p->call, icause); + p->call = NULL; } if (res < 0) ast_log(LOG_WARNING, "pri_disconnect failed\n"); @@ -3463,6 +3464,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) if (!pri_grab(p, p->pri)) { pri_hangup(p->pri->pri, p->call, -1); pri_destroycall(p->pri->pri, p->call); + p->call = NULL; pri_rel(p->pri); } else ast_log(LOG_WARNING, "Failed to grab PRI!\n"); @@ -3471,7 +3473,6 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast) } if (p->owner) p->owner->_softhangup |= AST_SOFTHANGUP_DEV; - p->call = NULL; if (p->bearer) p->bearer->inalarm = 1; else |