kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-30 10:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't free private structure until iax2_hangup is actually called

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-02-06 18:11:13 +00:00
parent 82e18770bc
commit cf4825233d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
channels/chan_iax2.c
View File

@@ -1038,9 +1038,11 @@ retry:
goto retry; goto retry;
} }
} }
iaxs[callno] = NULL; if (!owner)
iaxs[callno] = NULL;
if (pvt) { if (pvt) {
pvt->owner = NULL; if (!owner)
pvt->owner = NULL;
/* No more pings or lagrq's */ /* No more pings or lagrq's */
if (pvt->pingid > -1) if (pvt->pingid > -1)
ast_sched_del(sched, pvt->pingid); ast_sched_del(sched, pvt->pingid);
@@ -1063,7 +1065,6 @@ retry:
if (owner) { if (owner) {
/* If there's an owner, prod it to give up */ /* If there's an owner, prod it to give up */
owner->pvt->pvt = NULL;
owner->_softhangup |= AST_SOFTHANGUP_DEV; owner->_softhangup |= AST_SOFTHANGUP_DEV;
ast_queue_hangup(owner, 0); ast_queue_hangup(owner, 0);
} }
@@ -1076,7 +1077,8 @@ retry:
if (pvt->reg) { if (pvt->reg) {
pvt->reg->callno = 0; pvt->reg->callno = 0;
} }
free(pvt); if (!owner)
free(pvt);
} }
if (owner) { if (owner) {
ast_mutex_unlock(&owner->lock); ast_mutex_unlock(&owner->lock);