Permalink
Browse files

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>
  • Loading branch information...
Ariel Badichi authored and gitster committed Apr 23, 2008
1 parent 8b1f6de commit 75b7dfbdc030cfc6f09a6317444c36c4957a9133
Showing with 2 additions and 2 deletions.
  1. +2 −2 archive.c
View
@@ -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;

0 comments on commit 75b7dfb

Please sign in to comment.