From c94414a4c8cd099f5737e8b4066693d07ce78f61 Mon Sep 17 00:00:00 2001 From: Mark Lodato Date: Thu, 26 Aug 2010 22:02:03 -0400 Subject: t0108-patch: add 'tests_done' to end Signed-off-by: Mark Lodato --- tests/t0108-patch.sh | 2 ++ 1 file changed, 2 insertions(+) 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 @@ -35,3 +35,5 @@ run_test 'generate patch for initial commit' ' run_test 'find `cgit` signature' ' tail -1 trash/tmp | grep -e "^cgit" ' + +tests_done -- cgit 1.4.1-21-gabe81 From 48434780ca62fde84337ea1e797f642de5ca50d5 Mon Sep 17 00:00:00 2001 From: Mark Lodato Date: Fri, 27 Aug 2010 21:02:27 -0400 Subject: html: fix strcpy bug in convert_query_hexchar The source and destination strings in strcpy() may not overlap. Instead, use memmove(), which allows overlap. This fixes test t0104, where 'url=foo%2bbar/tree' was being parsed improperly. Signed-off-by: Mark Lodato --- html.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/html.c b/html.c index 66ba65d..d86b2c1 100644 --- a/html.c +++ b/html.c @@ -240,19 +240,20 @@ 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; } 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; } } -- cgit 1.4.1-21-gabe81