From: Mark Michelson <mmichelson@digium.com>
Date: Mon, 18 May 2009 19:00:51 +0000 (+0000)
Subject: Merged revisions 195316 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~228
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=512f09a102f29d2a6fc4e36f157d7a71fb6e22e9;p=thirdparty%2Fasterisk.git

Merged revisions 195316 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r195316 | mmichelson | 2009-05-18 13:58:26 -0500 (Mon, 18 May 2009) | 18 lines

  Fix externalivr's setvariable command so that it properly sets multiple variables.

  The command had a for loop that was guaranteed to only execute once since
  the continuation operation of the loop would set the input buffer NULL. I rewrote
  the loop so that its operation was more obvious, and it would set multiple variables
  correctly.

  I also reduced stack space required for the function, constified the input string,
  and modified the function so that it would not modify the input string while I was
  at it.

  (closes issue #15114)
  Reported by: chris-mac
  Patches:
        15114.patch uploaded by mmichelson (license 60)
  Tested by: chris-mac
........


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

diff --git a/apps/app_externalivr.c b/apps/app_externalivr.c
index a10517516d..0e4d441424 100644
--- a/apps/app_externalivr.c
+++ b/apps/app_externalivr.c
@@ -282,29 +282,20 @@ static void ast_eivr_getvariable(struct ast_channel *chan, char *data, char *out
 
 static void ast_eivr_setvariable(struct ast_channel *chan, char *data)
 {
-	char buf[1024];
 	char *value;
 
-	char *inbuf, *variable;
-
-	int j;
+	char *inbuf = ast_strdupa(data), *variable;
 
-	for (j = 1, inbuf = data; ; j++, inbuf = NULL) {
-		variable = strsep(&inbuf, ",");
+	for (variable = strsep(&inbuf, ","); variable; variable = strsep(&inbuf, ",")) {
 		ast_debug(1, "Setting up a variable: %s\n", variable);
-		if (variable) {
-			/* variable contains "varname=value" */
-			ast_copy_string(buf, variable, sizeof(buf));
-			value = strchr(buf, '=');
-			if (!value) {
-				value = "";
-			} else {
-				*value++ = '\0';
-			}
-			pbx_builtin_setvar_helper(chan, buf, value);
+		/* variable contains "varname=value" */
+		value = strchr(variable, '=');
+		if (!value) {
+			value = "";
 		} else {
-			break;
+			*value++ = '\0';
 		}
+		pbx_builtin_setvar_helper(chan, variable, value);
 	}
 }