kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 18:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock potential of chan_mobile.c:mbl_ast_hangup().

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@333784 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-08-29 21:05:43 +00:00
parent 92ad64998c
commit 97959f3e9a
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
addons/chan_mobile.c
View File

@@ -1321,21 +1321,10 @@ static int mbl_queue_hangup(struct mbl_pvt *pvt)
static int mbl_ast_hangup(struct mbl_pvt *pvt) static int mbl_ast_hangup(struct mbl_pvt *pvt)
{ {
int res = 0; if (pvt->owner) {
for (;;) { ast_hangup(pvt->owner);
if (pvt->owner) {
if (ast_channel_trylock(pvt->owner)) {
DEADLOCK_AVOIDANCE(&pvt->lock);
} else {
res = ast_hangup(pvt->owner);
/* no need to unlock, ast_hangup() frees the
* channel */
break;
}
} else
break;
} }
return res; return 0;
} }
/*! /*!