[asterisk-commits] mmichelson: trunk r81683 - in /trunk: ./ res/res_features.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Sep  6 10:21:45 2007
New Revision: 81683

URL: http://svn.digium.com/view/asterisk?view=rev&rev=81683
Log:
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)


........

Modified:
    trunk/   (props changed)
    trunk/res/res_features.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/res/res_features.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_features.c?view=diff&rev=81683&r1=81682&r2=81683
==============================================================================
--- trunk/res/res_features.c (original)
+++ trunk/res/res_features.c Thu Sep  6 10:21:45 2007
@@ -1990,7 +1990,7 @@
 			
 			/* 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;