diff options
| author | Lars Hjemli | 2010-08-29 17:40:51 +0200 |
|---|---|---|
| committer | Lars Hjemli | 2010-08-29 17:40:51 +0200 |
| commit | 6940b23b9e4698ba466a4616e4de77b986560ad3 (patch) | |
| tree | 69dc61393b834474a8556d7b3969b327d223dc15 /html.c | |
| parent | Use GIT-1.7.2.2 (diff) | |
| parent | html: fix strcpy bug in convert_query_hexchar (diff) | |
| download | cgit-6940b23b9e4698ba466a4616e4de77b986560ad3.tar.gz cgit-6940b23b9e4698ba466a4616e4de77b986560ad3.zip | |
Merge branch 'stable'
Diffstat (limited to 'html.c')
| -rw-r--r-- | html.c | 9 |
1 files changed, 5 insertions, 4 deletions
| diff --git a/html.c b/html.c index 337baeb..eaabf72 100644 --- a/html.c +++ b/html.c | |||
| @@ -268,19 +268,20 @@ int hextoint(char c) | |||
| 268 | 268 | ||
| 269 | char *convert_query_hexchar(char *txt) | 269 | char *convert_query_hexchar(char *txt) |
| 270 | { | 270 | { |
| 271 | int d1, d2; | 271 | int d1, d2, n; |
| 272 | if (strlen(txt) < 3) { | 272 | n = strlen(txt); |
| 273 | if (n < 3) { | ||
| 273 | *txt = '\0'; | 274 | *txt = '\0'; |
| 274 | return txt-1; | 275 | return txt-1; |
| 275 | } | 276 | } |
| 276 | d1 = hextoint(*(txt+1)); | 277 | d1 = hextoint(*(txt+1)); |
| 277 | d2 = hextoint(*(txt+2)); | 278 | d2 = hextoint(*(txt+2)); |
| 278 | if (d1<0 || d2<0) { | 279 | if (d1<0 || d2<0) { |
| 279 | strcpy(txt, txt+3); | 280 | memmove(txt, txt+3, n-3); |
| 280 | return txt-1; | 281 | return txt-1; |
| 281 | } else { | 282 | } else { |
| 282 | *txt = d1 * 16 + d2; | 283 | *txt = d1 * 16 + d2; |
| 283 | strcpy(txt+1, txt+3); | 284 | memmove(txt+1, txt+3, n-2); |
| 284 | return txt; | 285 | return txt; |
| 285 | } | 286 | } |
| 286 | } | 287 | } |