From: Jason Parker <jparker@digium.com>
Date: Tue, 2 Oct 2007 18:52:55 +0000 (+0000)
Subject: Finish up on transferee channel before return on failure.
X-Git-Tag: 1.4.12~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01480eb1fbcbf7cdd1c02c44b1e69a6e6c26f583;p=thirdparty%2Fasterisk.git

Finish up on transferee channel before return on failure.

Issue 10821, patch by Ivan


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

diff --git a/res/res_features.c b/res/res_features.c
index 0cf317843d..e738d14770 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -816,8 +816,11 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
 		return FEATURE_RETURN_SUCCESS;
 	}
 
-	if (check_compat(transferer, newchan))
+	if (check_compat(transferer, newchan)) {
+		/* we do mean transferee here, NOT transferer */
+		finishup(transferee);
 		return -1;
+	};
 	memset(&bconfig,0,sizeof(struct ast_bridge_config));
 	ast_set_flag(&(bconfig.features_caller), AST_FEATURE_DISCONNECT);
 	ast_set_flag(&(bconfig.features_callee), AST_FEATURE_DISCONNECT);
@@ -831,8 +834,10 @@ static int builtin_atxfer(struct ast_channel *chan, struct ast_channel *peer, st
 		return FEATURE_RETURN_SUCCESS;
 	}
 	
-	if (check_compat(transferee, newchan))
+	if (check_compat(transferee, newchan)) {
+		finishup(transferee);
 		return -1;
+	};
 
 	ast_indicate(transferee, AST_CONTROL_UNHOLD);