git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
	Git mailing list <git@vger.kernel.org>
Subject: Re: [PATCHv4 1/2] clone: respect additional configured fetch refspecs during initial fetch
Date: Wed, 31 May 2017 11:34:23 +0200	[thread overview]
Message-ID: <CAM0VKjkfuyBzZmpJL47xmK24EOh6X5OjrxtxVdsgGupAseT_wQ@mail.gmail.com> (raw)
In-Reply-To: <20170531042304.unkxkuw6s3tcpzkm@sigill.intra.peff.net>

On Wed, May 31, 2017 at 6:23 AM, Jeff King <peff@peff.net> wrote:
> On Tue, May 30, 2017 at 09:12:43AM +0200, SZEDER Gábor wrote:
>
>> diff --git a/remote.c b/remote.c
>> index ad6c5424e..b8fd09dc9 100644
>> --- a/remote.c
>> +++ b/remote.c
>> @@ -626,6 +626,19 @@ struct refspec *parse_fetch_refspec(int nr_refspec, const char **refspec)
>>       return parse_refspec_internal(nr_refspec, refspec, 1, 0);
>>  }
>>
>> +void add_and_parse_fetch_refspec(struct remote *remote, const char *refspec)
>> +{
>> +     struct refspec *rs;
>> +
>> +     add_fetch_refspec(remote, refspec);
>> +     rs = parse_fetch_refspec(1, &refspec);
>> +     REALLOC_ARRAY(remote->fetch, remote->fetch_refspec_nr);
>> +     remote->fetch[remote->fetch_refspec_nr - 1] = *rs;
>> +
>> +     /* Not free_refspecs(), as we copied its pointers above */
>> +     free(rs);
>> +}
>
> What happens here if remote->fetch isn't already initialized? I think
> we'd end up with a bunch of garbage values. That's what I was trying to
> protect against in my original suggestion.
>
> I'm not sure if that's possible or not. We seem to initialize it in both
> remote_get() and for_each_remote(), and I don't think there are any
> other ways to get a remote.

The only place creating remotes is remote.c:make_remote(), which
calloc()s the required memory, making all of struct remote's fields
zero-initialized.  In case of clone the common case is that the user
doesn't specify any additional fetch refspecs, so remote->fetch will
still be NULL after full initialization and when
add_and_parse_fetch_refspec() is called with the default fetch
refspec, meaning we can't 'if (remote->fetch) { parse ... }'.  OTOH,
all functions involved can cope with the fetch-refspec-related fields
being 0/NULL, and at the time remote->fetch_refspec_nr-1 is used for
array indexing it's not 0 anymore.

> (In fact, I kind of wondered why we do this
> parsing lazily at all, but I think it's so that misconfigured remotes
> don't cause us to die() if we aren't accessing them at all).
>
> If we assume that the contract that remote.c provides is that the
> fetch fields are always filled in before a "struct remote" is returned
> to a caller, and that only such callers would use this function, it's
> OK. It just seems more dangerous than it needs to be.
>
> -Peff

  reply	other threads:[~2017-05-31  9:34 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-15 11:05 [PATCHv3 0/4] clone: respect configured fetch respecs during initial fetch SZEDER Gábor
2017-05-15 11:05 ` [PATCHv3 1/4] clone: respect additional configured fetch refspecs " SZEDER Gábor
2017-05-15 23:07   ` Jeff King
2017-05-26 10:04     ` SZEDER Gábor
2017-05-26 13:30       ` Jeff King
2017-05-30  3:53         ` Junio C Hamano
2017-05-30  3:55           ` Jeff King
2017-05-30  7:11           ` SZEDER Gábor
2017-05-30  7:12             ` [PATCHv4 1/2] " SZEDER Gábor
2017-05-30  7:12               ` [PATCHv4 2/2] Documentation/clone: document ignored configuration variables SZEDER Gábor
2017-05-30  9:01                 ` Ævar Arnfjörð Bjarmason
2017-05-31  8:50                   ` SZEDER Gábor
2017-05-31 14:17                     ` Ævar Arnfjörð Bjarmason
2017-06-13 23:24                 ` Jonathan Nieder
2017-05-31  4:23               ` [PATCHv4 1/2] clone: respect additional configured fetch refspecs during initial fetch Jeff King
2017-05-31  9:34                 ` SZEDER Gábor [this message]
2017-06-05  8:18                   ` Jeff King
2017-06-06 18:19                     ` SZEDER Gábor
2017-06-06 18:37                       ` Jeff King
2017-06-07 11:17                         ` SZEDER Gábor
2017-06-14  0:48               ` Jonathan Nieder
2017-06-14  9:50                 ` Jeff King
2017-06-16 17:36                 ` SZEDER Gábor
2017-06-16 17:38                   ` [PATCHv5 0/2] " SZEDER Gábor
2017-06-16 17:38                     ` [PATCHv5 1/2] " SZEDER Gábor
2017-06-16 20:37                       ` Jonathan Nieder
2017-06-17 11:22                       ` Jeff King
2017-06-22 22:23                         ` Junio C Hamano
2017-08-12  0:48                           ` Junio C Hamano
2017-06-16 17:38                     ` [PATCHv5 2/2] Documentation/clone: document ignored configuration variables SZEDER Gábor
2017-06-16 18:23                       ` Ævar Arnfjörð Bjarmason
2017-06-16 20:41                         ` Jonathan Nieder
2017-06-16 21:10                           ` Ævar Arnfjörð Bjarmason
2017-06-16 22:15                             ` SZEDER Gábor
2017-06-16 20:38                       ` Jonathan Nieder
2017-06-16 22:09                       ` Junio C Hamano
2017-05-31  4:27             ` [PATCH] remote: drop free_refspecs() function Jeff King
2017-06-14  0:49               ` Jonathan Nieder
2017-05-15 11:05 ` [PATCHv3 2/4] Documentation/clone: document ignored configuration variables SZEDER Gábor
2017-05-26 14:01   ` SZEDER Gábor
2017-05-15 11:05 ` [PATCHv3 3/4] remote: drop free_refspecs() function SZEDER Gábor
2017-05-15 11:05 ` [PATCHv3 4/4] clone: use free_refspec() to free refspec list SZEDER Gábor
2017-05-15 11:29   ` SZEDER Gábor
2017-05-15 23:10     ` Jeff King
2017-05-23  7:38     ` Junio C Hamano
2017-05-23 11:27       ` Jeff King
2017-05-23 12:06       ` SZEDER Gábor
2017-05-15 22:46 ` [PATCHv3 0/4] clone: respect configured fetch respecs during initial fetch Jeff King

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAM0VKjkfuyBzZmpJL47xmK24EOh6X5OjrxtxVdsgGupAseT_wQ@mail.gmail.com \
    --to=szeder.dev@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).