Merged revisions 8588 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r8588 | kpfleming | 2006-01-24 16:32:09 -0600 (Tue, 24 Jan 2006) | 2 lines ensure that channel cannot become zombie after we check but before we try to start indications ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@8591 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
70489608a8
commit
fc8902082c
|
@ -2050,10 +2050,12 @@ int ast_indicate(struct ast_channel *chan, int condition)
|
||||||
{
|
{
|
||||||
int res = -1;
|
int res = -1;
|
||||||
|
|
||||||
/* Stop if we're a zombie or need a soft hangup */
|
|
||||||
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan))
|
|
||||||
return -1;
|
|
||||||
ast_mutex_lock(&chan->lock);
|
ast_mutex_lock(&chan->lock);
|
||||||
|
/* Stop if we're a zombie or need a soft hangup */
|
||||||
|
if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
|
||||||
|
ast_mutex_unlock(&chan->lock);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
if (chan->tech->indicate)
|
if (chan->tech->indicate)
|
||||||
res = chan->tech->indicate(chan, condition);
|
res = chan->tech->indicate(chan, condition);
|
||||||
ast_mutex_unlock(&chan->lock);
|
ast_mutex_unlock(&chan->lock);
|
||||||
|
|
Reference in New Issue