[asterisk-commits] oej: branch oej/bufo-manager-setvar r287544 - in /team/oej/bufo-manager-setva...

[SVN commits to the Asterisk project]

Author: oej
Date: Sun Sep 19 14:57:35 2010
New Revision: 287544

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=287544
Log:
Release manager variables set with setvar

Modified:
    team/oej/bufo-manager-setvar/   (props changed)
    team/oej/bufo-manager-setvar/main/manager.c

Propchange: team/oej/bufo-manager-setvar/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Modified: team/oej/bufo-manager-setvar/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/bufo-manager-setvar/main/manager.c?view=diff&rev=287544&r1=287543&r2=287544
==============================================================================
--- team/oej/bufo-manager-setvar/main/manager.c (original)
+++ team/oej/bufo-manager-setvar/main/manager.c Sun Sep 19 14:57:35 2010
@@ -1964,7 +1964,9 @@
 	/* Locked by ast_pbx_outgoing_exten or ast_pbx_outgoing_app */
 	if (chan)
 		ast_channel_unlock(chan);
-	ast_variables_destroy(in->vars);
+	if (in->vars) {
+		ast_variables_destroy(in->vars);
+	}
 	free(in);
 	return NULL;
 }
@@ -2098,7 +2100,9 @@
 			pthread_attr_init(&attr);
 			pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 			if (ast_pthread_create(&th, &attr, fast_originate, fast)) {
-				ast_variables_destroy(fast->vars);
+				if (fast->vars) {
+					ast_variables_destroy(fast->vars);
+				}
 				ast_free(fast);
 				res = -1;
 			} else {
@@ -2113,7 +2117,9 @@
 	        	res = ast_pbx_outgoing_exten(tech, format, data, to, context, exten, pi, &reason, 1, l, n, vars, account, NULL);
 		else {
 			astman_send_error(s, m, "Originate with 'Exten' requires 'Context' and 'Priority'");
-			ast_variables_destroy(vars);
+			if (vars) {
+				ast_variables_destroy(vars);
+			}
 			return 0;
 		}
 	}   
@@ -2121,7 +2127,9 @@
 		astman_send_ack(s, m, "Originate successfully queued");
 	else
 		astman_send_error(s, m, "Originate failed");
-	ast_variables_destroy(vars);
+	if (vars) {
+		ast_variables_destroy(vars);
+	}
 	return 0;
 }