[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH]Fix Segfault while detecting the implicit merge source

From: Daniel Rall <dlr_at_collab.net>
Date: 2007-05-15 19:44:01 CEST

On Tue, 15 May 2007, Kamesh Jayachandran wrote:

>
> >> ctx, pool));
> >>@@ -241,7 +242,7 @@
> >> {
> >> const char *path;
> >> apr_hash_this(hi, (void *) &path, NULL, NULL);
> >>- if (strcmp(path, copyfrom_path) != 0)
> >>+ if (copyfrom_path && strcmp(path, copyfrom_path) != 0)
> >>
> >
> >Shouldn't this be?:
> >
> > if (copyfrom_path == NULL || strcmp(path, copyfrom_path) != 0)
> >
>
> No. It segfaults in strcmp when copyfrom_path is NULL.

Right -- and the additional check avoids the strcmp() in the case
where copyfrom_path is NULL. However, the strcmp() is only there to
weed out the case where copyfrom_path exists as a merge source. If we
have no copyfrom_path, we can avoid the string equality check
entirely.

+1 to commit with this tweak.

  • application/pgp-signature attachment: stored
Received on Tue May 15 19:44:15 2007

This is an archived mail posted to the Subversion Dev mailing list.