Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed possible hangup race condition that would lead to segfualt with hangups.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6516 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Matthew Fredrickson 20 years ago
parent 4daf98741a
commit 7348cba9c7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File

3
channels/chan_zap.c
Unescape View File

@ -2347,6 +2347,7 @@ static int zt_hangup(struct ast_channel *ast)
icause = atoi(cause); icause = atoi(cause);
} }
pri_hangup(p->pri->pri, p->call, icause); pri_hangup(p->pri->pri, p->call, icause);
p->call = NULL;
} }
if (res < 0) if (res < 0)
ast_log(LOG_WARNING, "pri_disconnect failed\n"); 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)) { if (!pri_grab(p, p->pri)) {
pri_hangup(p->pri->pri, p->call, -1); pri_hangup(p->pri->pri, p->call, -1);
pri_destroycall(p->pri->pri, p->call); pri_destroycall(p->pri->pri, p->call);
p->call = NULL;
pri_rel(p->pri); pri_rel(p->pri);
} else } else
ast_log(LOG_WARNING, "Failed to grab PRI!\n"); 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) if (p->owner)
p->owner->_softhangup |= AST_SOFTHANGUP_DEV; p->owner->_softhangup |= AST_SOFTHANGUP_DEV;
p->call = NULL;
if (p->bearer) if (p->bearer)
p->bearer->inalarm = 1; p->bearer->inalarm = 1;
else else

Write Preview
Loading…
Cancel
Save