cgit

commit 6940b23b9e4698ba466a4616e4de77b986560ad3

Author: Lars Hjemli <hjemli@gmail.com>

Merge branch 'stable'

 html.c | 9 +++++----
 tests/t0108-patch.sh | 2 ++


diff --git a/html.c b/html.c
index 337baebea5c8c9540f2b4dcf2ee4895e9e5cdd74..eaabf7274eca79c7f9391f50130ff82e99199879 100644
--- a/html.c
+++ b/html.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;
 	}
 }




diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index 33351d6df592421be4fdf13d2f44f2c27257fa7e..e608104733c299340c472eac9ed6e0408b966cd5 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -35,3 +35,5 @@
 run_test 'find `cgit` signature' '
 	tail -1 trash/tmp | grep -e "^cgit"
 '
+
+tests_done