Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Fix is_gitfile() for files larger than PATH_MAX
Date: Tue, 11 Oct 2011 13:25:32 -0700	[thread overview]
Message-ID: <7vy5wre0n7.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.1110111424010.32316@s15462909.onlinehome-server.info> (Johannes Schindelin's message of "Tue, 11 Oct 2011 14:25:32 -0500 (CDT)")

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> The logic to check whether a file is a gitfile used the heuristics that
> the file cannot be larger than PATH_MAX. But in that case it returned the
> wrong value. Our test cases do not cover this, as the bundle files
> produced are smaller than PATH_MAX. Except on Windows.
>
> While at it, fix the faulty logic that the path stored in a gitfile cannot
> be larger than PATH_MAX-sizeof("gitfile: ").
>
> Problem identified by running the test suite in msysGit, offending commit
> identified by Jörg Rosenkranz.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> 	This patch should apply cleanly to 'next', which we track in
> 	msysgit/git.
>
> 	The task of adding a test case is something I leave to someone who
> 	wants to get involved with Git development and needs an easy way
> 	in.
>
>  transport.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/transport.c b/transport.c
> index f3195c0..57138d9 100644
> --- a/transport.c
> +++ b/transport.c
> @@ -868,8 +868,8 @@ static int is_gitfile(const char *url)
>  		return 0;
>  	if (!S_ISREG(st.st_mode))
>  		return 0;
> -	if (st.st_size < 10 || st.st_size > PATH_MAX)
> -		return 1;
> +	if (st.st_size < 10 || st.st_size > 9 + PATH_MAX)
> +		return 0;

We are asked if the file is likely to be a single-liner "gitfile: <path>",
and were answering yes when it is a very short file (less than 10 bytes)
that cannot possibly even contain "gitfile: " prefix.

I suspect that we can and should get rid of the "cannot be very long"
check altogether---we do open and check the file, and after all it is not
like we are throwing different strings as "url" argument to this function
at random and this function needs heuristics to reject bogus input
early. The argument is an input from the user.

Quite an embarrasing bug. Thanks for spotting.

  reply	other threads:[~2011-10-11 20:25 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-11 19:25 [PATCH] Fix is_gitfile() for files larger than PATH_MAX Johannes Schindelin
2011-10-11 20:25 ` Junio C Hamano [this message]
2011-10-11 20:58   ` Phil Hord
2011-10-11 22:10     ` Phil Hord

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=7vy5wre0n7.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    /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