Merge branch 'maint'

diff --git a/archive.c b/archive.c
index fb159fe59e9e6fc40db584468c7b1ddf8495ccb3..7a32c19d3ca8043f3ca22dadfdbc60dbbb747d59 100644 (file)
--- a/archive.c
+++ b/archive.c
@@ -16,9 +16,9 @@ static void format_subst(const struct commit *commit,
                const char *b, *c;
 
                b = memmem(src, len, "$Format:", 8);
-               if (!b || src + len < b + 9)
+               if (!b)
                        break;
-               c = memchr(b + 8, '$', len - 8);
+               c = memchr(b + 8, '$', (src + len) - b - 8);
                if (!c)
                        break;