From: Jonathan Nieder <jrnieder@gmail.com>
To: Thomas Rast <trast@student.ethz.ch>
Cc: Bert Wesarg <bert.wesarg@googlemail.com>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] merge-file: correctly find files when called in subdir
Date: Sun, 17 Oct 2010 11:05:46 -0500 [thread overview]
Message-ID: <20101017160546.GD301@burratino> (raw)
In-Reply-To: <201010171239.13990.trast@student.ethz.ch>
Thomas Rast wrote:
> I was ready to say "you're right" to Bert's suggestion. So maybe, for
> the sake of foolproof-ness, we should do something like the patch
> below?
>
> diff --git i/setup.c w/setup.c
> index a3b76de..7c8906d 100644
> --- i/setup.c
> +++ w/setup.c
> @@ -55,7 +55,7 @@
> /* don't add prefix to absolute paths, but still replace '\' by '/' */
> if (is_absolute_path(arg))
> pfx_len = 0;
> - else
> + else if (pfx && *pfx)
> memcpy(path, pfx, pfx_len);
> strcpy(path + pfx_len, arg);
> for (p = path + pfx_len; *p; p++)
Yes, please! But I'd write it as
if (pfx_len)
memcpy(...)
and rely on the commit message to explain that this is about the !pfx
case (so callers with pfx_len == 3, !pfx get a nice, quick segfault
instead of heisenbugs from uninitialized data).
next prev parent reply other threads:[~2010-10-17 16:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-16 11:33 [PATCH] merge-file: correctly find files when called in subdir Thomas Rast
2010-10-16 13:30 ` Bert Wesarg
2010-10-17 1:11 ` Jonathan Nieder
2010-10-17 10:39 ` Thomas Rast
2010-10-17 16:05 ` Jonathan Nieder [this message]
2010-10-17 19:23 ` [PATCH v2 1/2] prefix_filename(): safely handle the case where pfx_len=0 Thomas Rast
2010-10-17 19:23 ` [PATCH v2 2/2] merge-file: correctly find files when called in subdir Thomas Rast
2010-10-17 19:59 ` Jonathan Nieder
2010-10-18 6:10 ` Johannes Sixt
2010-10-17 1:30 ` [PATCH] " Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101017160546.GD301@burratino \
--to=jrnieder@gmail.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).