diff options
| author | Lars Hjemli | 2011-05-30 23:57:25 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2011-05-30 23:57:25 +0200 |
| commit | 52fbcf2ffac0025128cc1d50681a7ccd859ef3f0 (patch) | |
| tree | 46ef06dfd6575e672dc4d5c92b522af7c3bf5f1c | |
| parent | ui_repolist: get modtime from packed-refs as fallback (diff) | |
| parent | Properly escape ampersands inside HTML attributes (diff) | |
| download | cgit-52fbcf2ffac0025128cc1d50681a7ccd859ef3f0.tar.gz cgit-52fbcf2ffac0025128cc1d50681a7ccd859ef3f0.zip | |
Merge branch 'stable'
| -rw-r--r-- | html.c | 4 |
1 files changed, 3 insertions, 1 deletions
| diff --git a/html.c b/html.c index 4a18a57..eb1c25d 100644 --- a/html.c +++ b/html.c | |||
| @@ -138,7 +138,7 @@ void html_attr(const char *txt) | |||
| 138 | const char *t = txt; | 138 | const char *t = txt; |
| 139 | while(t && *t){ | 139 | while(t && *t){ |
| 140 | int c = *t; | 140 | int c = *t; |
| 141 | if (c=='<' || c=='>' || c=='\'' || c=='\"') { | 141 | if (c=='<' || c=='>' || c=='\'' || c=='\"' || c=='&') { |
| 142 | html_raw(txt, t - txt); | 142 | html_raw(txt, t - txt); |
| 143 | if (c=='>') | 143 | if (c=='>') |
| 144 | html(">"); | 144 | html(">"); |
| @@ -148,6 +148,8 @@ void html_attr(const char *txt) | |||
| 148 | html("'"); | 148 | html("'"); |
| 149 | else if (c=='"') | 149 | else if (c=='"') |
| 150 | html("""); | 150 | html("""); |
| 151 | else if (c=='&') | ||
| 152 | html("&"); | ||
| 151 | txt = t+1; | 153 | txt = t+1; |
| 152 | } | 154 | } |
| 153 | t++; | 155 | t++; |