| -rw-r--r-- | html.c | 9 | ||||
| -rwxr-xr-x | tests/t0108-patch.sh | 2 |
2 files changed, 7 insertions, 4 deletions
@@ -255,45 +255,46 @@ int html_include(const char *filename) } int hextoint(char c) { if (c >= 'a' && c <= 'f') return 10 + c - 'a'; else if (c >= 'A' && c <= 'F') return 10 + c - 'A'; else if (c >= '0' && c <= '9') return c - '0'; else return -1; } 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; } } int http_parse_querystring(const char *txt_, void (*fn)(const char *name, const char *value)) { char *t, *txt, *value = NULL, c; if (!txt_) return 0; t = txt = strdup(txt_); if (t == NULL) { printf("Out of memory\n"); exit(1); } 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 @@ -22,16 +22,18 @@ run_test 'find `Subject:` line' ' run_test 'find `cgit` signature' ' tail -1 trash/tmp | grep -e "^cgit" ' run_test 'find initial commit' ' root=$(git --git-dir=$PWD/trash/repos/foo/.git rev-list HEAD | tail -1) ' run_test 'generate patch for initial commit' ' cgit_query "url=foo/patch&id=$root" >trash/tmp ' run_test 'find `cgit` signature' ' tail -1 trash/tmp | grep -e "^cgit" ' + +tests_done |