Merged revisions 329145 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Thu, 21 Jul 2011 16:59:38 +0000 (16:59 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 21 Jul 2011 16:59:38 +0000 (16:59 +0000)
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329145 | rmudgett | 2011-07-21 11:52:17 -0500 (Thu, 21 Jul 2011) | 16 lines

  Merged revisions 329144 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r329144 | rmudgett | 2011-07-21 11:46:21 -0500 (Thu, 21 Jul 2011) | 9 lines

    Dialplan bridge() app mutex 'current_dest_chan' freed more times than we've locked!

    This appears to be a leftover from when ast_channel was converted to ao2
    objects.

    Simply removed the extraneous unlock.

    (closes issue ASTERISK-17772)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@329146 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/features.c

index 7f8444c..5d3eda6 100644 (file)
@@ -6149,8 +6149,6 @@ static int bridge_exec(struct ast_channel *chan, const char *data)
                                        "Channel2: %s\r\n", chan->name, args.dest_chan);
        }
 
-       ast_channel_unlock(current_dest_chan);
-
        do_bridge_masquerade(current_dest_chan, final_dest_chan);
 
        chans[0] = current_dest_chan;