From 75b7dfbdc030cfc6f09a6317444c36c4957a9133 Mon Sep 17 00:00:00 2001
From: Ariel Badichi <abadichi@bezeqint.net>
Date: Wed, 23 Apr 2008 04:06:27 +0300
Subject: [PATCH] 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>
---
 archive.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/archive.c b/archive.c
index fb159fe59e..7a32c19d3c 100644
--- 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;
 
-- 
2.11.4.GIT