Merged revisions 8588 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Tue, 24 Jan 2006 22:38:17 +0000 (22:38 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Tue, 24 Jan 2006 22:38:17 +0000 (22:38 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@8591 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channel.c

index de737f7..19f2a81 100644 (file)
--- a/channel.c
+++ b/channel.c
@@ -2050,10 +2050,12 @@ int ast_indicate(struct ast_channel *chan, int condition)
 {
        int res = -1;
 
 {
        int res = -1;
 
+       ast_mutex_lock(&chan->lock);
        /* Stop if we're a zombie or need a soft hangup */
        /* Stop if we're a zombie or need a soft hangup */
-       if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) 
+       if (ast_test_flag(chan, AST_FLAG_ZOMBIE) || ast_check_hangup(chan)) {
+               ast_mutex_unlock(&chan->lock);
                return -1;
                return -1;
-       ast_mutex_lock(&chan->lock);
+       }
        if (chan->tech->indicate)
                res = chan->tech->indicate(chan, condition);
        ast_mutex_unlock(&chan->lock);
        if (chan->tech->indicate)
                res = chan->tech->indicate(chan, condition);
        ast_mutex_unlock(&chan->lock);