[asterisk-commits] twilson: branch 10 r360717 - in /branches/10: ./ addons/ cdr/ channels/

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Mar 28 14:20:04 2012
New Revision: 360717

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=360717
Log:
Destroy configs when they are no longer used

https://reviewboard.asterisk.org/r/1834/
........

Merged revisions 360712 from http://svn.asterisk.org/svn/asterisk/branches/1.8

Modified:
    branches/10/   (props changed)
    branches/10/addons/cdr_mysql.c
    branches/10/addons/chan_ooh323.c
    branches/10/cdr/cdr_adaptive_odbc.c
    branches/10/channels/chan_gtalk.c
    branches/10/channels/chan_jingle.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/addons/cdr_mysql.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/addons/cdr_mysql.c?view=diff&rev=360717&r1=360716&r2=360717
==============================================================================
--- branches/10/addons/cdr_mysql.c (original)
+++ branches/10/addons/cdr_mysql.c Wed Mar 28 14:20:04 2012
@@ -462,6 +462,7 @@
 		if (reload) {
 			AST_RWLIST_UNLOCK(&columns);
 		}
+		ast_config_destroy(cfg);
 		return AST_MODULE_LOAD_SUCCESS;
 	}
 
@@ -502,6 +503,7 @@
 		if (reload) {
 			AST_RWLIST_UNLOCK(&columns);
 		}
+		ast_config_destroy(cfg);
 		return AST_MODULE_LOAD_FAILURE;
 	}
 

Modified: branches/10/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/addons/chan_ooh323.c?view=diff&rev=360717&r1=360716&r2=360717
==============================================================================
--- branches/10/addons/chan_ooh323.c (original)
+++ branches/10/addons/chan_ooh323.c Wed Mar 28 14:20:04 2012
@@ -2686,6 +2686,7 @@
 			ast_copy_string(gIP, v->value, sizeof(gIP));
 			if (ast_parse_arg(v->value, PARSE_ADDR, &bindaddr)) {
 				ast_log(LOG_WARNING, "Invalid address: %s\n", v->value);
+				ast_config_destroy(cfg);
 				return 1;
 			}
 			if (ast_sockaddr_is_ipv6(&bindaddr)) {
@@ -2739,6 +2740,7 @@
          		pNewAlias = ast_calloc(1, sizeof(struct ooAliases));
 			if (!pNewAlias) {
 				ast_log(LOG_ERROR, "Failed to allocate memory for h323id alias\n");
+				ast_config_destroy(cfg);
 				return 1;
 			}
 	 		if (gAliasList == NULL) { /* first h323id - set as callerid if callerid is not set */
@@ -2753,6 +2755,7 @@
          		pNewAlias = ast_calloc(1, sizeof(struct ooAliases));
 			if (!pNewAlias) {
 				ast_log(LOG_ERROR, "Failed to allocate memory for e164 alias\n");
+				ast_config_destroy(cfg);
 				return 1;
 			}
 			pNewAlias->type =  T_H225AliasAddress_dialedDigits;
@@ -2764,6 +2767,7 @@
          		pNewAlias = ast_calloc(1, sizeof(struct ooAliases));
 			if (!pNewAlias) {
 				ast_log(LOG_ERROR, "Failed to allocate memory for email alias\n");
+				ast_config_destroy(cfg);
 				return 1;
 			}
 			pNewAlias->type =  T_H225AliasAddress_email_ID;

Modified: branches/10/cdr/cdr_adaptive_odbc.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/cdr/cdr_adaptive_odbc.c?view=diff&rev=360717&r1=360716&r2=360717
==============================================================================
--- branches/10/cdr/cdr_adaptive_odbc.c (original)
+++ branches/10/cdr/cdr_adaptive_odbc.c Wed Mar 28 14:20:04 2012
@@ -272,6 +272,7 @@
 		else
 			ast_free(tableptr);
 	}
+	ast_config_destroy(cfg);
 	return res;
 }
 

Modified: branches/10/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_gtalk.c?view=diff&rev=360717&r1=360716&r2=360717
==============================================================================
--- branches/10/channels/chan_gtalk.c (original)
+++ branches/10/channels/chan_gtalk.c Wed Mar 28 14:20:04 2012
@@ -2286,6 +2286,7 @@
 		cat = ast_category_browse(cfg, cat);
 	}
 
+	ast_config_destroy(cfg);
 	gtalk_update_externip();
 	gtalk_free_candidates(global_candidates);
 	return 1;

Modified: branches/10/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_jingle.c?view=diff&rev=360717&r1=360716&r2=360717
==============================================================================
--- branches/10/channels/chan_jingle.c (original)
+++ branches/10/channels/chan_jingle.c Wed Mar 28 14:20:04 2012
@@ -1926,6 +1926,7 @@
 		}
 		cat = ast_category_browse(cfg, cat);
 	}
+	ast_config_destroy(cfg);
 	jingle_free_candidates(global_candidates);
 	return 1;
 }