From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ariel Badichi Subject: [PATCH] archive.c: format_subst - fixed bogus argument to memchr Date: Wed, 23 Apr 2008 04:06:27 +0300 Message-ID: <873apdpegc.fsf@sneeze.site> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: gitster@pobox.com To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Apr 23 03:04:14 2008 connect(): Connection refused Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JoTP7-0000mZ-4H for gcvg-git-2@gmane.org; Wed, 23 Apr 2008 03:04:09 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759063AbYDWBDX (ORCPT ); Tue, 22 Apr 2008 21:03:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757473AbYDWBDW (ORCPT ); Tue, 22 Apr 2008 21:03:22 -0400 Received: from bzq-84-110-251-84.red.bezeqint.net ([84.110.251.84]:25573 "EHLO sneeze.site" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755898AbYDWBDV (ORCPT ); Tue, 22 Apr 2008 21:03:21 -0400 Received: by sneeze.site (Postfix, from userid 1000) id 94ABD7A7A6; Wed, 23 Apr 2008 04:06:28 +0300 (IDT) User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.1 (gnu/linux) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Also removed a superfluous test. Signed-off-by: Ariel Badichi --- archive.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/archive.c b/archive.c index fb159fe..7a32c19 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; -- 1.5.5.1.57.g5909c