archive.c: format_subst - fixed bogus argument to memchr
Also removed a superfluous test. Signed-off-by: Ariel Badichi <abadichi@bezeqint.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ariel Badichi committed
Apr 23, 2008 at 04:06 UTC
75b7dfbdc030cfc6f09a6317444c36c4957a9133
1 file changed
+2
-2
archive.c
+2
-2
@@ -16,9 +16,9 @@ static void format_subst(const struct commit *commit,
16
const char *b, *c;
17
18
b = memmem(src, len, "$Format:", 8);
19
- if (!b || src + len < b + 9)
19
+ if (!b)
20
break;
21
- c = memchr(b + 8, '$', len - 8);
21
+ c = memchr(b + 8, '$', (src + len) - b - 8);
22
if (!c)
23
break;
24