X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/69f705cf5727cc1f099f6cd6af759f66bfd9a343..a0bf375a1a9b74056a913f3687c6f5b42ad4acf6:/html.c

diff --git a/html.c b/html.c
index 1305910..a0f6db4 100644
--- a/html.c
+++ b/html.c
@@ -162,9 +162,9 @@ void html_url_path(const char *txt)
 	while(t && *t){
 		int c = *t;
 		const char *e = url_escape_table[c];
-		if (e && c!='+' && c!='&' && c!='+') {
+		if (e && c!='+' && c!='&') {
 			html_raw(txt, t - txt);
-			html_raw(e, 3);
+			html(e);
 			txt = t+1;
 		}
 		t++;
@@ -179,9 +179,11 @@ void html_url_arg(const char *txt)
 	while(t && *t){
 		int c = *t;
 		const char *e = url_escape_table[c];
+		if (c == ' ')
+			e = "+";
 		if (e) {
 			html_raw(txt, t - txt);
-			html_raw(e, 3);
+			html(e);
 			txt = t+1;
 		}
 		t++;
@@ -277,7 +279,7 @@ char *convert_query_hexchar(char *txt)
 	d1 = hextoint(*(txt+1));
 	d2 = hextoint(*(txt+2));
 	if (d1<0 || d2<0) {
-		memmove(txt, txt+3, n-3);
+		memmove(txt, txt+3, n-2);
 		return txt-1;
 	} else {
 		*txt = d1 * 16 + d2;
@@ -288,12 +290,12 @@ char *convert_query_hexchar(char *txt)
 
 int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value))
 {
-	char *t, *txt, *value = NULL, c;
+	char *o, *t, *txt, *value = NULL, c;
 
 	if (!txt_)
 		return 0;
 
-	t = txt = strdup(txt_);
+	o = t = txt = strdup(txt_);
 	if (t == NULL) {
 		printf("Out of memory\n");
 		exit(1);
@@ -316,5 +318,6 @@ int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const
 	}
 	if (t!=txt)
 		(*fn)(txt, value);
+	free(o);
 	return 0;
 }