aboutsummaryrefslogtreecommitdiffstats
path: root/main/pbx.c
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-03 14:13:50 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-03 14:13:50 +0000
commit1f81d7e41884c075e99927bad475d8d39581a5a9 (patch)
tree142a02a2dcb8eac694954cbd8e36e152be96e431 /main/pbx.c
parent242793bbf5291537f0f955b453fa35d5b12e4962 (diff)
Merged revisions 140691 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r140691 | murf | 2008-09-02 16:50:59 -0600 (Tue, 02 Sep 2008) | 22 lines Merged revisions 140670 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r140670 | murf | 2008-09-02 16:15:57 -0600 (Tue, 02 Sep 2008) | 14 lines (closes issue #13409) Reported by: tomaso Patches: asterisk-1.6.0-rc2-cdrmemleak.patch uploaded by tomaso (license 564) I basically spent the day, verifying that this patch solves the problem, and doesn't hurt in non-problem cases. Why valgrind did not plainly reveal this leak absolutely mystifies and stuns me. Many, many thanks to tomaso for finding and providing the fix. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@140825 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
-rw-r--r--main/pbx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/pbx.c b/main/pbx.c
index 8846a9e72..5eb255014 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -6972,6 +6972,7 @@ static int ast_pbx_outgoing_cdr_failed(void)
ast_cdr_end(chan->cdr);
ast_cdr_failed(chan->cdr); /* set the status to failed */
ast_cdr_detach(chan->cdr); /* post and free the record */
+ chan->cdr = NULL;
ast_channel_free(chan); /* free the channel */
return 0; /* success */