[asterisk-commits] bweschke: branch 1.4 r150816 - /branches/1.4/main/manager.c

[SVN commits to the Asterisk project]

Author: bweschke
Date: Fri Oct 17 20:42:23 2008
New Revision: 150816

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150816
Log:
 Using the GetVar handler in AMI is potentially dangerous (insta-crash [tm]) when you use a dialplan function that requires a channel and then you don't provide one or provide an invalid one in the Channel: parameter. We'll handle this situation exactly the same way it was handled in pbx.c back on r61766. We'll create a bo
gus channel for the function call and destroy it when we're done. If we have trouble allocating the bogus channel then we're not going to try executing the function call at all and run the risk of crashing.


Modified:
    branches/1.4/main/manager.c

Modified: branches/1.4/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/manager.c?view=diff&rev=150816&r1=150815&r2=150816
==============================================================================
--- branches/1.4/main/manager.c (original)
+++ branches/1.4/main/manager.c Fri Oct 17 20:42:23 2008
@@ -1499,8 +1499,15 @@
 
 	if (varname[strlen(varname) - 1] == ')') {
 		char *copy = ast_strdupa(varname);
-
-		ast_func_read(c, copy, workspace, sizeof(workspace));
+		if (!c) {
+			c = ast_channel_alloc(0, 0, "", "", "", "", "", 0, "Bogus/%p", NULL);
+			if (c) {
+				ast_func_read(c, copy, workspace, sizeof(workspace));
+				ast_channel_free(c);
+			} else
+				ast_log(LOG_ERROR, "Unable to allocate bogus channel for variable substitution.  Function results may be blank.\n");
+		} else
+			ast_func_read(c, copy, workspace, sizeof(workspace));
 		varval = workspace;
 	} else {
 		pbx_retrieve_variable(c, varname, &varval, workspace, sizeof(workspace), NULL);