From: Mark Michelson <mmichelson@digium.com>
Date: Thu, 6 Sep 2007 15:21:45 +0000 (+0000)
Subject: Merged revisions 81682 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1516
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6d61ac8cc27bd2b283bd9cef449ffab9c1bc5dc5;p=thirdparty%2Fasterisk.git

Merged revisions 81682 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r81682 | mmichelson | 2007-09-06 10:20:36 -0500 (Thu, 06 Sep 2007) | 5 lines

Fixes a memory leak

(closes issue #10658, reported and patched by Ivan)


........


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

diff --git a/res/res_features.c b/res/res_features.c
index a9c252b7e6..dea8d805ae 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -1990,7 +1990,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast
 			
 			/* absorb the peer cdr */
 			ast_cdr_merge(bridge_cdr, peer->cdr);
-			if (ast_test_flag(peer->cdr, AST_CDR_FLAG_LOCKED))
+			if (!ast_test_flag(peer->cdr, AST_CDR_FLAG_LOCKED))
 				ast_cdr_discard(peer->cdr); /* if locked cdrs are in peer, they are taken over in the merge */
 			
 			peer->cdr = NULL;