all repos — cgit @ 6940b23b9e4698ba466a4616e4de77b986560ad3

a hyperfast web frontend for git written in c

Merge branch 'stable'
Lars Hjemli hjemli@gmail.com
Sun, 29 Aug 2010 17:40:51 +0200
commit

6940b23b9e4698ba466a4616e4de77b986560ad3

parent

6d7552bc072599313ef423d69156d824c075572a

2 files changed, 7 insertions(+), 4 deletions(-)

jump to
M html.chtml.c

@@ -268,19 +268,20 @@ }

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; } d1 = hextoint(*(txt+1)); 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; } }
M tests/t0108-patch.shtests/t0108-patch.sh

@@ -35,3 +35,5 @@

run_test 'find `cgit` signature' ' tail -1 trash/tmp | grep -e "^cgit" ' + +tests_done