diff options
author | Mark Michelson <mmichelson@digium.com> | 2007-09-06 15:21:45 +0000 |
---|---|---|
committer | Mark Michelson <mmichelson@digium.com> | 2007-09-06 15:21:45 +0000 |
commit | 6d61ac8cc27bd2b283bd9cef449ffab9c1bc5dc5 (patch) | |
tree | 2618440d154a5999575f15ce47ed3d3273d0e234 | |
parent | cbbfbb65e8596a1b2afd384d312e0fc800656583 (diff) |
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
-rw-r--r-- | res/res_features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_features.c b/res/res_features.c index a9c252b7e..dea8d805a 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; |