From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 4 Jun 2008 20:34:52 +0000 (+0000)
Subject: MSet doesn't necessarily need chan to be set
X-Git-Tag: 1.6.2.0-beta1~2079
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12cf254253e33052c3942fdfa7dbdab90b9f5708;p=thirdparty%2Fasterisk.git

MSet doesn't necessarily need chan to be set


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

diff --git a/main/pbx.c b/main/pbx.c
index 2b0ee7603d..bc006c994b 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7887,7 +7887,7 @@ int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata)
 		AST_APP_ARG(value);
 	);
 
-	if (ast_strlen_zero(vdata) || !chan) {
+	if (ast_strlen_zero(vdata)) {
 		ast_log(LOG_WARNING, "MSet requires at least one variable name/value pair.\n");
 		return 0;
 	}
@@ -7901,6 +7901,8 @@ int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata)
 			pbx_builtin_setvar_helper(chan, pair.name, pair.value);
 			if (strchr(pair.name, ' '))
 				ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", pair.name, pair.value);
+		} else if (chan) {
+			ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '='\n", pair.name);
 		} else {
 			ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '=' (in %s@%s:%d\n", pair.name, chan->exten, chan->context, chan->priority);
 		}