Re: [VALGRIND PATCH for nth_last patch series] Fix invalid memory access
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 21, 2009, 11:56 UTC
- Message-ID
- <alpine.DEB.1.00.0901211256370.3586@pacific.mpi-cbg.de>
- In-Reply-To
- <7vwscpgi7t.fsf@gitster.siamese.dyndns.org>
Hi,
On Wed, 21 Jan 2009, Junio C Hamano wrote:
Show 29 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > sha1_name.c | 2 +-
> > 1 files changed, 1 insertions(+), 1 deletions(-)
> >
> > diff --git a/sha1_name.c b/sha1_name.c
> > index 4d10705..803f9d2 100644
> > --- a/sha1_name.c
> > +++ b/sha1_name.c
> > @@ -735,7 +735,7 @@ static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1,
> > if ((target = strstr(match, " to ")) != NULL) {
> > len = target - match;
> > target += 4;
> > - if (target[len] == '\n' && !strncmp(match, target, len))
> > + if (len == strlen(target) && !strncmp(match, target, len))
> > return 0;
> > }
> > else
>
> Actually, I think this patch to a884d0c (sha1_name: tweak @{-N} lookup,
> 2009-01-17) would make more sense.
>
> -- >8 --
> Subject: [PATCH] Simplify parsing branch switching events in reflog
>
> We only accept "checkout: moving from A to B" newer style reflog entries,
> in order to pick up A. There is no point computing where B begins at
> after running strstr to locate " to ", nor adding 4 and then subtracting 4
> from the same pointer.Yeah, you're right.
Ciao, Dscho