diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-07 22:09:10 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-07 22:09:10 +0000 |
commit | 6d6b520aba0c25a7c4e097e67d7c4d37ce99f0bb (patch) | |
tree | 3f154bfb8e898d604dcda26d810c34170253a3da | |
parent | 227698cc981b33c64009390d655a254bfd29d359 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@89089 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | cdr/cdr_tds.c | 6 | ||||
-rw-r--r-- | 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 af58b86e6..4acd5359e 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 7bd96016c..c4d626ccb 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; } |