From: Jeff King <peff@peff.net>
To: David Turner <dturner@twopensource.com>
Cc: git@vger.kernel.org, mhagger@alum.mit.edu, pclouds@gmail.com
Subject: Re: [PATCH v6 28/32] config: read ref storage config on startup
Date: Fri, 26 Feb 2016 22:56:34 -0500 [thread overview]
Message-ID: <20160227035634.GA10829@sigill.intra.peff.net> (raw)
In-Reply-To: <1456354744-8022-29-git-send-email-dturner@twopensource.com>
On Wed, Feb 24, 2016 at 05:59:00PM -0500, David Turner wrote:
> @@ -1207,6 +1208,29 @@ int git_config_early(config_fn_t fn, void *data, const char *repo_config)
> }
>
> if (repo_config && !access_or_die(repo_config, R_OK, 0)) {
> + char *storage = NULL;
> +
> + /*
> + * make sure we always read the ref storage config
> + * from the extensions section on startup
> + */
> + ret += git_config_from_file(ref_storage_backend_config,
> + repo_config, &storage);
> +
> + register_ref_storage_backends();
> + if (!storage)
> + storage = xstrdup("");
> +
> + if (!*storage ||
> + !strcmp(storage, "files")) {
> + /* default backend, nothing to do */
> + free(storage);
> + } else {
> + if (set_ref_storage_backend(ref_storage_backend))
> + die(_("Unknown ref storage backend %s"),
> + ref_storage_backend);
> + }
> +
Coverity complains that "storage" leaks here, and I think it does in the
case that we non-default storage, and we successfully set up the
backend. That's a pretty minor point.
However, after looking at this code, I'm rather confused about a few
things.
One is that we read the config and use ref_storage_backend_config[1] to
store the string value in "storage", and then we check whether that is
non-default, and if it is, I'd expect us to feed it to
set_ref_storage_backend. But we don't; we feed ref_storage_backend
instead!
What is that value? It looks like it is the string we set in
check_repo_format when we load the extensions list there. So why
are we re-reading the config here at all? Couldn't we just use
ref_storage_backend in the first place?
My second confusion is why this is happening in git_config_early(). That
function is called during the setup of check_repository_format_gently(),
which is why I think you wanted to put the code here. But it's _also_
called as part of a regular git_config(). Which means we're parsing the
repo config and setting the ref backend all over again, every time we
look at config for other reasons.
So I think this setup probably should be in
check_repository_format_gently(), and should be able to trigger off of
the existing ref_storage_backend string we've already saved (and we
should bail immediately there if we don't know about the backend, as it
means we _don't_ match the repo's extensions and cannot proceed).
-Peff
[1] The ref_storage_backend_config function uses xstrdup(), which I
think will segfault for a value-less boolean config, like:
[extensions]
# notice no "=" sign!
refstorage
The same bug is in check_repo_format, where we assigned
ref_storage_backend. The normal way to do this is to use:
return git_config_string(var, value, &ref_backend_storage);
which checks for the boolean case and complains.
next prev parent reply other threads:[~2016-02-27 3:56 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-24 22:58 [PATCH v6 00/32] refs backend David Turner
2016-02-24 22:58 ` [PATCH v6 01/32] refs: move head_ref{,_submodule} to the common code David Turner
2016-02-24 22:58 ` [PATCH v6 02/32] refs: move for_each_*ref* functions into " David Turner
2016-02-24 22:58 ` [PATCH v6 03/32] files-backend: break out ref reading David Turner
2016-02-25 0:21 ` Junio C Hamano
2016-02-25 0:51 ` Junio C Hamano
2016-02-25 20:11 ` David Turner
2016-02-25 20:27 ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 04/32] refs: move resolve_ref_unsafe into common code David Turner
2016-02-25 0:22 ` Junio C Hamano
2016-02-24 22:58 ` [PATCH v6 05/32] refs: add a backend method structure with transaction functions David Turner
2016-02-27 4:06 ` Jeff King
2016-02-29 20:43 ` David Turner
2016-02-24 22:58 ` [PATCH v6 06/32] refs: add methods for misc ref operations David Turner
2016-02-24 22:58 ` [PATCH v6 07/32] refs: add method for do_for_each_ref David Turner
2016-02-24 22:58 ` [PATCH v6 08/32] refs: reduce the visibility of do_for_each_ref() David Turner
2016-02-24 22:58 ` [PATCH v6 09/32] refs: add do_for_each_per_worktree_ref David Turner
2016-02-24 22:58 ` [PATCH v6 10/32] refs: add methods for reflog David Turner
2016-02-24 22:58 ` [PATCH v6 11/32] refs: add method for initial ref transaction commit David Turner
2016-02-24 22:58 ` [PATCH v6 12/32] refs: add method for delete_refs David Turner
2016-02-24 22:58 ` [PATCH v6 13/32] refs: add methods to init refs db David Turner
2016-02-24 22:58 ` [PATCH v6 14/32] refs: add method to rename refs David Turner
2016-02-24 22:58 ` [PATCH v6 15/32] refs: handle non-normal ref renames David Turner
2016-02-24 22:58 ` [PATCH v6 16/32] refs: make lock generic David Turner
2016-02-24 22:58 ` [PATCH v6 17/32] refs: move duplicate check to common code David Turner
2016-02-24 22:58 ` [PATCH v6 18/32] refs: allow log-only updates David Turner
2016-02-24 22:58 ` [PATCH v6 19/32] refs: don't dereference on rename David Turner
2016-02-24 22:58 ` [PATCH v6 20/32] refs: on symref reflog expire, lock symref not referrent David Turner
2016-02-24 22:58 ` [PATCH v6 21/32] refs: resolve symbolic refs first David Turner
2016-02-24 22:58 ` [PATCH v6 22/32] refs: always handle non-normal refs in files backend David Turner
2016-02-24 22:58 ` [PATCH v6 23/32] init: allow alternate ref strorage to be set for new repos David Turner
2016-02-24 22:58 ` [PATCH v6 24/32] refs: check submodules' ref storage config David Turner
2016-02-24 22:58 ` [PATCH v6 25/32] clone: allow ref storage backend to be set for clone David Turner
2016-02-24 22:58 ` [PATCH v6 26/32] svn: learn ref-storage argument David Turner
2016-02-24 22:58 ` [PATCH v6 27/32] refs: register ref storage backends David Turner
2016-02-24 22:59 ` [PATCH v6 28/32] config: read ref storage config on startup David Turner
2016-02-27 3:56 ` Jeff King [this message]
2016-02-27 4:14 ` Jeff King
2016-02-29 21:57 ` David Turner
2016-02-29 22:13 ` Jeff King
2016-02-29 21:57 ` David Turner
2016-02-29 22:10 ` Jeff King
2016-02-29 22:21 ` Jeff King
2016-02-29 22:59 ` David Turner
2016-02-24 22:59 ` [PATCH v6 29/32] refs: break out resolve_ref_unsafe_submodule David Turner
2016-02-24 22:59 ` [PATCH v6 30/32] refs: add LMDB refs storage backend David Turner
2016-02-24 22:59 ` [PATCH v6 31/32] refs: tests for lmdb backend David Turner
2016-02-24 22:59 ` [PATCH v6 32/32] tests: add ref-storage argument David Turner
2016-02-29 22:52 ` SZEDER Gábor
2016-02-29 23:50 ` David Turner
2016-02-25 0:08 ` [PATCH v6 00/32] refs backend Ramsay Jones
2016-02-25 19:32 ` David Turner
2016-02-25 12:57 ` Duy Nguyen
2016-02-25 19:27 ` David Turner
2016-02-25 19:31 ` Stefan Beller
2016-02-25 20:31 ` Duy Nguyen
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=20160227035634.GA10829@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pclouds@gmail.com \
/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).