aboutsummaryrefslogtreecommitdiffstats
path: root/cdr
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-03 01:57:44 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2009-04-03 01:57:44 +0000
commitdd9202dc7873945bed0d315cee3477660e6c36ae (patch)
tree88e55efc9759a1a10f759724397bbe56f5cdb614 /cdr
parentec7e5f73385b6951a58070e720d45fc08c79977e (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@186229 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
-rw-r--r--cdr/cdr_radius.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 6d890e764..ae9449466 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -219,12 +219,18 @@ static int radius_log(struct ast_cdr *cdr)
if (build_radius_record(&send, cdr)) {
if (option_debug)
ast_log(LOG_DEBUG, "Unable to create RADIUS record. CDR not recorded!\n");
- return result;
+ goto return_cleanup;
}
-
+
result = rc_acct(rh, 0, send);
- if (result != OK_RC)
+ if (result != OK_RC) {
ast_log(LOG_ERROR, "Failed to record Radius CDR record!\n");
+ }
+
+return_cleanup:
+ if (send) {
+ rc_avpair_free(send);
+ }
return result;
}