From: Richard Mudgett <rmudgett@digium.com>
Date: Thu, 21 Jul 2011 16:52:17 +0000 (+0000)
Subject: Merged revisions 329144 via svnmerge from
X-Git-Tag: 10.0.0-beta1~3^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a62f5b7373e5509abff4867021cca63e0110a87a;p=thirdparty%2Fasterisk.git

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/branches/10@329145 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/features.c b/main/features.c
index 7f8444c174..5d3eda6166 100644
--- a/main/features.c
+++ b/main/features.c
@@ -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;