author | Lars Hjemli <hjemli@gmail.com> | 2010-08-29 15:40:51 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-29 15:40:51 (UTC) |
commit | 6940b23b9e4698ba466a4616e4de77b986560ad3 (patch) (unidiff) | |
tree | 69dc61393b834474a8556d7b3969b327d223dc15 /html.c | |
parent | 6d7552bc072599313ef423d69156d824c075572a (diff) | |
parent | 48434780ca62fde84337ea1e797f642de5ca50d5 (diff) | |
download | cgit-6940b23b9e4698ba466a4616e4de77b986560ad3.zip cgit-6940b23b9e4698ba466a4616e4de77b986560ad3.tar.gz cgit-6940b23b9e4698ba466a4616e4de77b986560ad3.tar.bz2 |
Merge branch 'stable'
-rw-r--r-- | html.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -270,4 +270,5 @@ 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'; |
@@ -278,3 +279,3 @@ char *convert_query_hexchar(char *txt) | |||
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; |
@@ -282,3 +283,3 @@ char *convert_query_hexchar(char *txt) | |||
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; |