| 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) (side-by-side diff) | |
| tree | 69dc61393b834474a8556d7b3969b327d223dc15 | |
| 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 | ||||
| -rwxr-xr-x | tests/t0108-patch.sh | 2 |
2 files changed, 7 insertions, 4 deletions
@@ -269,6 +269,7 @@ int hextoint(char c) char *convert_query_hexchar(char *txt) { - int d1, d2; - if (strlen(txt) < 3) { + int d1, d2, n; + n = strlen(txt); + if (n < 3) { *txt = '\0'; return txt-1; @@ -277,9 +278,9 @@ char *convert_query_hexchar(char *txt) d2 = hextoint(*(txt+2)); if (d1<0 || d2<0) { - strcpy(txt, txt+3); + memmove(txt, txt+3, n-3); return txt-1; } else { *txt = d1 * 16 + d2; - strcpy(txt+1, txt+3); + memmove(txt+1, txt+3, n-2); return txt; } diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh index 33351d6..e608104 100755 --- a/tests/t0108-patch.sh +++ b/tests/t0108-patch.sh @@ -36,2 +36,4 @@ run_test 'find `cgit` signature' ' tail -1 trash/tmp | grep -e "^cgit" ' + +tests_done |