aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-02 22:15:57 +0000
committermurf <murf@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-02 22:15:57 +0000
commitbc36ad3cc87dbf399f9fe36db6b7a41ba83b8895 (patch)
treed2505c05e7bba184ab97082cfb77a91a03d9daf0
parentf3d350391e14ccbbc1f06d20cf4885681b72175e (diff)
(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.4@140670 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/channel.c6
-rw-r--r--main/pbx.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c
index 3006e71cb..3bbccff7c 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -1277,6 +1277,11 @@ void ast_channel_free(struct ast_channel *chan)
/* Destroy the jitterbuffer */
ast_jb_destroy(chan);
+
+ if (chan->cdr) {
+ ast_cdr_free(chan->cdr);
+ chan->cdr = NULL;
+ }
ast_mutex_destroy(&chan->lock);
@@ -1523,6 +1528,7 @@ int ast_hangup(struct ast_channel *chan)
ast_cdr_end(chan->cdr);
ast_cdr_detach(chan->cdr);
+ chan->cdr = NULL;
}
ast_channel_free(chan);
diff --git a/main/pbx.c b/main/pbx.c
index f4e5a150c..f4dfd0d52 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -4972,6 +4972,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 */