Re: [PATCH] make config --add behave correctly for empty and NULL values

[Junio C Hamano <gitster@pobox.com>]

Tanay Abhra <tanayabh@gmail.com> writes:

> Currently if we have a config file like,
> [foo]
>         baz
>         bar =
>
> and we try something like, "git config --add foo.baz roll", Git will
> segfault.

Thanks; this is a good find.

This is a tangent, but people please stop starting their sentence
with a somewhat irritating "Currently"; it does not help both
current and future readers very much without some mention of version
numbers.

I suspect this bug dates back to pretty much day one of "git config"
(dates at least back to 1.5.3).

> The problem lies with the regexp used for simulating --add in
> `git_config_set_multivar_in_file()`, "^$", which in ideal case should
> not match with any string but is true for empty strings. Instead use a
> regexp like "a^" which can not be true for any string, empty or not.

Yuck, but we cannot pass NULL or some other special value that look
more meaningful to signal the fact that we do not want to match
anything, so this seems to be the easiest way out.  

Are we sure that "a^", which cannot be true for any string, will not
be caught by anybody's regcomp() as an error?  I know regcomp()
accepts the expression and regexec() fails to match with GNU libc,
but that is not the whole of the world.

At least, please make it clear for those who read this code later
what is going on with this magic "a^", perhaps with

	#define REGEXP_THAT_NEVER_MATCHES "a^"
	...
        return git_config_set_multivar_in_file(given_config_source.file,
                                              argv[0], value,
                                              REGEXP_THAT_NEVER_MATCHES, 0);
and/or with in-code comment.

	/*
         * set_multivar_in_file() removes existing values that match
         * the value_regexp argument and then adds this new value;
         * pass a pattern that never matches anything, as we do not
         * want to remove any existing value.
         */
	return git_config_set_multivar_in_file(given_config_source.file,
                                              argv[0], value,
                                              REGEXP_THAT_NEVER_MATCHES, 0);

To be honest, I'd rather see this done "right", by giving an option
to the caller to tell the function not to call regcomp/regexec in
matches().

 * Define a global exported via cache.h and defined in config.c

	extern const char CONFIG_SET_MULTIVAR_NO_REPLACE[];

   and pass it from this calling site, instead of an arbitrary
   literal string e.g. "a^"

 * Add a bit to the "store" struct, e.g. "unsigned value_never_matches:1";

 * In git_config_set_multivar_in_file() implementation, check for
   this constant address and set store.value_never_matches to true;

 * in matches(), check this bit and always return "No, this existing
   value do not match" when it is set.

or something like that.

> For removing the segfault add a check for NULL values in `matches()` in
> config.c.

The fact that you do a check is important, but it equally if not
more important what you do with the result.  "Check for a NULL and
consider it as not matching" is probably what you meant, but I'd
like to double check.

> Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
> ---
>  builtin/config.c        |  2 +-
>  config.c                |  2 +-
>  t/t1303-wacky-config.sh | 20 ++++++++++++++++++++
>  3 files changed, 22 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/config.c b/builtin/config.c
> index fcd8474..b9e7dce 100644
> --- a/builtin/config.c
> +++ b/builtin/config.c
> @@ -586,7 +586,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
>  		check_argc(argc, 2, 2);
>  		value = normalize_value(argv[0], argv[1]);
>  		return git_config_set_multivar_in_file(given_config_source.file,
> -						       argv[0], value, "^$", 0);
> +						       argv[0], value, "a^", 0);
>  	}
>  	else if (actions == ACTION_REPLACE_ALL) {
>  		check_write();
> diff --git a/config.c b/config.c
> index 058505c..67a7729 100644
> --- a/config.c
> +++ b/config.c
> @@ -1231,7 +1231,7 @@ static int matches(const char *key, const char *value)
>  	return !strcmp(key, store.key) &&
>  		(store.value_regex == NULL ||
>  		 (store.do_not_match ^
> -		  !regexec(store.value_regex, value, 0, NULL, 0)));
> +		  (value && !regexec(store.value_regex, value, 0, NULL, 0))));
>  }
>  
>  static int store_aux(const char *key, const char *value, void *cb)
> diff --git a/t/t1303-wacky-config.sh b/t/t1303-wacky-config.sh
> index 3a2c819..3b92083 100755
> --- a/t/t1303-wacky-config.sh
> +++ b/t/t1303-wacky-config.sh
> @@ -111,4 +111,24 @@ test_expect_success 'unset many entries' '
>  	test_must_fail git config section.key
>  '
>  
> +test_expect_success '--add appends new value after existing empty value' '
> +	cat >expect <<-\EOF &&
> +
> +
> +	fool
> +	roll
> +	EOF
> +	cp .git/config .git/config.old &&
> +	test_when_finished "mv .git/config.old .git/config" &&
> +	cat >.git/config <<-\EOF &&
> +	[foo]
> +		baz
> +		baz =
> +		baz = fool
> +	EOF
> +	git config --add foo.baz roll &&
> +	git config --get-all foo.baz >output &&
> +	test_cmp expect output
> +'
> +
>  test_done