From: Russell Bryant <russell@russellbryant.com>
Date: Fri, 27 Apr 2007 16:15:47 +0000 (+0000)
Subject: Merged revisions 62171 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2799
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec0cae93a4a51c9b110636c006e6d8913ae0e0c6;p=thirdparty%2Fasterisk.git

Merged revisions 62171 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r62171 | russell | 2007-04-27 11:14:11 -0500 (Fri, 27 Apr 2007) | 6 lines

If no variables were passed into pbx_substitute_variables_helper_full(), then
don't even bother creating a temporary bogus channel, since that is only for
allowing certain functions to operate on the variables as if they were on a
channel.  Most importantly, this fixes a crash.
(issue #9613, reported by callguy, fixed by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@62172 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/pbx.c b/main/pbx.c
index 0e4464a635..5f3f77b168 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -1564,7 +1564,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v
 			parse_variable_name(vars, &offset, &offset2, &isfunction);
 			if (isfunction) {
 				/* Evaluate function */
-				if (c)
+				if (c || !headp)
 					cp4 = ast_func_read(c, vars, workspace, VAR_BUF_SIZE) ? NULL : workspace;
 				else {
 					struct varshead old;