From fde695bb7f440798fd2d94a2d4aaf942023a6243 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 3 Apr 2009 02:03:48 +0000 Subject: [PATCH] Merged revisions 186229 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r186229 | russell | 2009-04-02 20:57:44 -0500 (Thu, 02 Apr 2009) | 21 lines Fix a memory leak in cdr_radius. I came across this while doing some testing of my ast_channel_ao2 branch. After running a test overnight that generated over 5 million calls, Asterisk had taken up about 1 GB of my system memory. So, I re-ran the test with MALLOC_DEBUG turned on. However, it showed no leaks in Asterisk during the test, even though Asterisk was still consuming it somehow. Instead, I turned to valgrind, which when run with --leak-check=full, told me exactly where the leak came from, which was from allocations inside the radiusclient-ng library. This explains why MALLOC_DEBUG did not report it. After a bit of analysis, I found that we were leaking a little bit of memory every time a CDR record was passed to cdr_radius. I don't actually have a radius server set up to receive CDR records. However, I always have my development systems compile and install all modules. In addition to making sure there are not build errors across modules, always loading modules helps find bugs like this, too, so it is strongly recommend for all developers. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@186230 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/cdr_radius.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c index eca07855e8..ed4d87b456 100644 --- a/cdr/cdr_radius.c +++ b/cdr/cdr_radius.c @@ -205,12 +205,18 @@ static int radius_log(struct ast_cdr *cdr) if (build_radius_record(&tosend, cdr)) { ast_debug(1, "Unable to create RADIUS record. CDR not recorded!\n"); - return result; + goto return_cleanup; } result = rc_acct(rh, 0, tosend); - if (result != OK_RC) + if (result != OK_RC) { ast_log(LOG_ERROR, "Failed to record Radius CDR record!\n"); + } + +return_cleanup: + if (tosend) { + rc_avpair_free(tosend); + } return result; }