Properly escape ampersands inside HTML attributes

[ps-cgit] / html.c

diff --git a/html.c b/html.c
index 6f31097f538fcb07b30ac59e4792cd5f5812a563..24a03a52b4042130a4da207ddafcfc370525658d 100644 (file)
--- a/html.c
+++ b/html.c
@@ -138,7 +138,7 @@ void html_attr(const char *txt)
        const char *t = txt;
        while(t && *t){
                int c = *t;
-               if (c=='<' || c=='>' || c=='\'' || c=='\"') {
+               if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') {
                        html_raw(txt, t - txt);
                        if (c=='>')
                                html("&gt;");
@@ -148,6 +148,8 @@ void html_attr(const char *txt)
                                html("&#x27;");
                        else if (c=='"')
                                html("&quot;");
+                       else if (c=='&')
+                               html("&amp;");
                        txt = t+1;
                }
                t++;
@@ -290,12 +292,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);
@@ -318,5 +320,6 @@ int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const
        }
        if (t!=txt)
                (*fn)(txt, value);
+       free(o);
        return 0;
 }