From b61babaf5804b35d1d8d37bbc0dc6334aaad358f Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 7 Oct 2010 11:00:52 +0000 Subject: [PATCH] Merged revisions 290712 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r290712 | russell | 2010-10-07 12:53:56 +0200 (Thu, 07 Oct 2010) | 4 lines Don't crash when Set() is called without a value. Review: https://reviewboard.asterisk.org/r/949/ ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@290713 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/pbx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/main/pbx.c b/main/pbx.c index 9b44306bf6..87ebdd854a 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -9550,11 +9550,18 @@ int pbx_builtin_setvar(struct ast_channel *chan, const char *data) mydata = ast_strdupa(data); name = strsep(&mydata, "="); value = mydata; - if (strchr(name, ' ')) + if (!value) { + ast_log(LOG_WARNING, "Set requires an '=' to be a valid assignment.\n"); + return 0; + } + + if (strchr(name, ' ')) { ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", name, mydata); + } pbx_builtin_setvar_helper(chan, name, value); - return(0); + + return 0; } int pbx_builtin_setvar_multiple(struct ast_channel *chan, const char *vdata)