From a87efea3c422c20fea826e902939b2e60468035e Mon Sep 17 00:00:00 2001 From: Steve Murphy Date: Wed, 7 Nov 2007 22:09:10 +0000 Subject: [PATCH] Merged revisions 89088 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r89088 | murf | 2007-11-07 14:40:28 -0700 (Wed, 07 Nov 2007) | 1 line In response to 10578, I just ran 1.4 thru valgrind; some of the config leakage I've already fixed, but it doesn't hurt to double check. I found and fixed leaks in res_jabber, cdr_tds, pbx_ael. Nothing major, tho. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@89089 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- cdr/cdr_tds.c | 6 ++++-- res/res_jabber.c | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c index af58b86e61..4acd5359e8 100644 --- a/cdr/cdr_tds.c +++ b/cdr/cdr_tds.c @@ -441,9 +441,11 @@ static int tds_load_module(int reload) return 0; var = ast_variable_browse(cfg, "global"); - if (!var) /* nothing configured */ + if (!var) /* nothing configured */ { + ast_config_destroy(cfg); return 0; - + } + ptr = ast_variable_retrieve(cfg, "global", "hostname"); if (ptr) { if (hostname) diff --git a/res/res_jabber.c b/res/res_jabber.c index 7bd96016c3..c4d626ccb5 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -2867,6 +2867,7 @@ static int aji_load_config(int reload) } cat = ast_category_browse(cfg, cat); } + ast_config_destroy(cfg); /* or leak memory */ return 1; }