[asterisk-commits] murf: trunk r89089 - in /trunk: ./ cdr/cdr_tds.c res/res_jabber.c

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Nov  7 16:09:10 2007
New Revision: 89089

URL: http://svn.digium.com/view/asterisk?view=rev&rev=89089
Log:
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.
........

Modified:
    trunk/   (props changed)
    trunk/cdr/cdr_tds.c
    trunk/res/res_jabber.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/cdr/cdr_tds.c
URL: http://svn.digium.com/view/asterisk/trunk/cdr/cdr_tds.c?view=diff&rev=89089&r1=89088&r2=89089
==============================================================================
--- trunk/cdr/cdr_tds.c (original)
+++ trunk/cdr/cdr_tds.c Wed Nov  7 16:09:10 2007
@@ -441,9 +441,11 @@
 		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)

Modified: trunk/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_jabber.c?view=diff&rev=89089&r1=89088&r2=89089
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Wed Nov  7 16:09:10 2007
@@ -2867,6 +2867,7 @@
 		}
 		cat = ast_category_browse(cfg, cat);
 	}
+	ast_config_destroy(cfg); /* or leak memory */
 	return 1;
 }