Never release lock when doing a hangup or bad things can happen when masq is taking place

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

2 files changed, 2 insertions, 2 deletions

diff --git a/channel.c b/channel.c
index c132899b1..89a6db7c6 100755
--- a/channel.c
+++ b/channel.c
@@ -1873,7 +1873,7 @@ static int ast_do_masquerade(struct ast_channel *original)
 	/* We need the clone's lock, too */
 	ast_pthread_mutex_lock(&clone->lock);
 
-	ast_log(LOG_DEBUG, "Got clone lock on '%s'\n", clone->name);
+	ast_log(LOG_DEBUG, "Got clone lock on '%s' at %p\n", clone->name, &clone->lock);
 
 	/* Having remembered the original read/write formats, we turn off any translation on either
 	   one */
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 3d4511d95..662cf7c0c 100755
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -297,7 +297,7 @@ static int local_hangup(struct ast_channel *ast)
 		/* Need to actually hangup since there is no PBX */
 		ochan = p->chan;
 	else
-		local_queue_frame(p, isoutbound, &f, ast);
+		local_queue_frame(p, isoutbound, &f, NULL);
 	ast_pthread_mutex_unlock(&p->lock);
 	if (ochan)
 		ast_hangup(ochan);