diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-03 02:43:06 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-03 02:43:06 +0000 |
| commit | 724e4e9b9c6c9d12d6545a6f1b084aaf2cc3ba98 (patch) | |
| tree | 416eeb3ce55d656f75708ad9ed351525270ef34c /channels/chan_agent.c | |
| parent | 6e39b348bdccc39c8f5a9997c0cc1920857c6f6b (diff) | |
Merged revisions 273830 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r273830 | tilghman | 2010-07-02 21:36:31 -0500 (Fri, 02 Jul 2010) | 16 lines
Merged revisions 273793 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r273793 | tilghman | 2010-07-02 16:36:39 -0500 (Fri, 02 Jul 2010) | 9 lines
Have the DEADLOCK_AVOIDANCE macro warn when an unlock fails, to help catch potentially large software bugs.
(closes issue #17407)
Reported by: pdf
Patches:
20100527__issue17407.diff.txt uploaded by tilghman (license 14)
Review: https://reviewboard.asterisk.org/r/751/
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@273831 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_agent.c')
| -rw-r--r-- | channels/chan_agent.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index ddfb74ae2..e0081ee30 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -733,7 +733,12 @@ static int agent_indicate(struct ast_channel *ast, int condition, const void *da ast_mutex_lock(&p->lock); if (p->chan && !ast_check_hangup(p->chan)) { while (ast_channel_trylock(p->chan)) { - ast_channel_unlock(ast); + int res; + if ((res = ast_channel_unlock(ast))) { + ast_log(LOG_ERROR, "chan_agent bug! Channel was not locked upon entry to agent_indicate: %s\n", strerror(res)); + ast_mutex_unlock(&p->lock); + return -1; + } usleep(1); ast_channel_lock(ast); } |