From 88dd7c37095614cdeb1f7f662a4a3e763b69b3a5 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 16 Oct 2012 18:32:14 +0100 Subject: Fix url encoded query generation, when there's no name/value pairs. --- render/form.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'render') diff --git a/render/form.c b/render/form.c index f60a2bad3..42e76e1f2 100644 --- a/render/form.c +++ b/render/form.c @@ -684,7 +684,7 @@ static char *form_url_encode(struct form *form, { char *name, *value; char *s, *s2; - unsigned int len, len1; + unsigned int len, len1, len_init; url_func_result url_err; if (query_string) @@ -698,10 +698,10 @@ static char *form_url_encode(struct form *form, if (query_string) { s[0] = '?'; s[1] = '\0'; - len = 1; + len_init = len = 1; } else { s[0] = '\0'; - len = 0; + len_init = len = 0; } for (; control; control = control->next) { @@ -737,7 +737,8 @@ static char *form_url_encode(struct form *form, free(value); } - if (len) + if (len > len_init) + /* Replace trailing '&' */ s[len - 1] = '\0'; return s; } -- cgit v1.2.3