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

diff --git a/cdr/cdr_tds.c b/cdr/cdr_tds.c
index af58b86e610c0bd7df725085ab075c3d8a9f1280..4acd5359e88589c178e0a1d67a2507e7b1fb513e 100644 (file)
--- 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 7bd96016c3b497e87979e3e57dbb6c04fb127b40..c4d626ccb51396dc31ee64962d18d1ed5a070ebd 100644 (file)
--- 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;
 }