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: Tue, 6 Jun 2017 20:19:09 +0200	[thread overview]
Message-ID: <CAM0VKjngnRv6iAozvhY_c61CyWhQP2khcr0bs1=7G_-MDNu4kg@mail.gmail.com> (raw)
In-Reply-To: <20170605081845.tvzidc5nblbnuner@sigill.intra.peff.net>

On Mon, Jun 5, 2017 at 10:18 AM, Jeff King <peff@peff.net> wrote:
> Yeah, I agree it is safe now. I'm just worried about some function in
> remote.c later doing:
>
>    read_config();
>    add_and_parse_fetch_refspec(remotes[0], whatever);
>
> which leaves the struct in an inconsistent state (we realloc NULL which
> allocates from scratch, and all of the other entries in remote->fetch
> end up uninitialized).  Can we at least add an assertion like:
>
>   if (!remote->fetch)
>         BUG("cannot add refspec to an unparsed remote");
>
> ?

But as mentioned before, remote->fetch being NULL is not a bug in
itself, it's a perfectly valid value even in a fully parsed remote
when the remote has no fetch refspecs.
Therefore, I think, the condition should instead be:

  remote->fetch_refspec_nr && !remote->fetch

We could even try to be extra helpful by checking this condition and
calling parse_fetch_refspec() to initialize remote->fetch instead of
BUG()ing out.  However, that would mask the real issue, namely not
using remote_get() to get the remote, so I don't actually think that's
a good thing to do.

OTOH, having remote->fetch so closely related to, yet separate from
remote->fetch_refspec{,_nr,_alloc} will always inherently be error
prone.  This assertion would catch one case where a less than careful
dev could cause trouble, sure, but there will be still others left,
e.g. he could still do:

  add_fetch_refspec(remote, ...);    // this doesn't update remote->fetch
  for (i = 0; i < remote->fetch_refspec_nr; i++)
        func(remote->fetch[i]);

and watch the array indexing blow up in the last iteration.

Or a non-hypothetical one: when I first tried to use remote_get() for
an earlier version of this patch, I ALLOC_GROW()-ed remote->fetch to
create room for the default refspec, because in struct remote not
**fetch_refspec but *fetch is listed right above
fetch_refspec_{nr,alloc}, being way past my bedtime may be my only
excuse...  It didn't work :) [1]

To put your worries to rest we should eliminate remote->fetch_refspec
altogether and parse refspecs into remote->fetch right away, I'd
think.  After all, that's what's used in most places anyway, and it
can be easily turned back to a single string where needed (I think in
only 3 places in builtin/remote.c).


[1] - Though in the end this could be considered beneficial, because
      commits 53c5de29 (pickaxe: fix segfault with '-S<...>
      --pickaxe-regex', 2017-03-18), 59210dd56 (tests: make the
      'test_pause' helper work in non-verbose mode, 2017-03-18), and
      4ecae3c8c (tests: create an interactive gdb session with the
      'debug' helper, 2017-03-18) were all fallouts from the ensuing
      debugging session :)

  reply	other threads:[~2017-06-06 18:19 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
2017-06-05  8:18                   ` Jeff King
2017-06-06 18:19                     ` SZEDER Gábor [this message]
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='CAM0VKjngnRv6iAozvhY_c61CyWhQP2khcr0bs1=7G_-MDNu4kg@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).