Merge branch 'stable'

2 files changed, 7 insertions, 4 deletions

diff --git a/html.c b/html.c
index 337baeb..eaabf72 100644
--- a/html.c
+++ b/html.c
@@ -270,4 +270,5 @@ 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';
@@ -278,3 +279,3 @@ char *convert_query_hexchar(char *txt)
         if (d1<0 || d2<0) {
-                strcpy(txt, txt+3);
+                memmove(txt, txt+3, n-3);
                 return txt-1;
@@ -282,3 +283,3 @@ char *convert_query_hexchar(char *txt)
                 *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
@@ -37 +37,3 @@ run_test 'find `cgit` signature' '
 '
+
+tests_done