From: Kevin P. Fleming <kpfleming@digium.com>
Date: Fri, 5 Jan 2007 22:53:38 +0000 (+0000)
Subject: Merged revisions 49680 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3545
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0542012c09d740364a8eb81f77497afcc1a3461;p=thirdparty%2Fasterisk.git

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

........
r49680 | kpfleming | 2007-01-05 16:52:37 -0600 (Fri, 05 Jan 2007) | 2 lines

don't 'consume' the params list before we try to use it again

........


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

diff --git a/main/manager.c b/main/manager.c
index 72b0cc9b5e..c1f72ca45d 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -2720,10 +2720,10 @@ static struct ast_str *generic_http_callback(enum output_format format,
 	unlink(template);
 	s->f = fdopen(s->fd, "w+");
 
-	for (x = 0; params && (x < AST_MAX_MANHEADERS); x++, params = params->next) {
-		hdrlen = strlen(params->name) + strlen(params->value) + 3;
+	for (x = 0, v = params; v && (x < AST_MAX_MANHEADERS); x++, v = v->next) {
+		hdrlen = strlen(v->name) + strlen(v->value) + 3;
 		m.headers[m.hdrcount] = alloca(hdrlen);
-		snprintf((char *) m.headers[m.hdrcount], hdrlen, "%s: %s", params->name, params->value);
+		snprintf((char *) m.headers[m.hdrcount], hdrlen, "%s: %s", v->name, v->value);
 		m.hdrcount = x + 1;
 	}