Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
test-path-utils: Fix off by one, found by valgrind
get_sha1_basic(): fix invalid memory access, found by valgrind

diff --git a/sha1_name.c b/sha1_name.c
index 159c2ab84fa2cdde0e540024a1ca22e0bbb43af8..722fc35a6d98e1c260c6e14738ad3b2d41d924aa 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -309,7 +309,7 @@ static int get_sha1_basic(const char *str, int len, unsigned char *sha1)
 
        /* basic@{time or number} format to query ref-log */
        reflog_len = at = 0;
-       if (str[len-1] == '}') {
+       if (len && str[len-1] == '}') {
                for (at = 0; at < len - 1; at++) {
                        if (str[at] == '@' && str[at+1] == '{') {
                                reflog_len = (len-1) - (at+2);

diff --git a/test-path-utils.c b/test-path-utils.c
index a0bcb0e210523124fa977c8bf46667cf25d0335f..2c0f5a37e8b9051b1db80aa04e9ea763fb8d772b 100644 (file)
--- a/test-path-utils.c
+++ b/test-path-utils.c
@@ -3,7 +3,7 @@
 int main(int argc, char **argv)
 {
        if (argc == 3 && !strcmp(argv[1], "normalize_absolute_path")) {
-               char *buf = xmalloc(strlen(argv[2])+1);
+               char *buf = xmalloc(PATH_MAX + 1);
                int rv = normalize_absolute_path(buf, argv[2]);
                assert(strlen(buf) == rv);
                puts(buf);