From c8466645edd1413c7efed824f5bddac457eb77f9 Mon Sep 17 00:00:00 2001 From: Tanay Abhra Date: Mon, 18 Aug 2014 03:17:57 -0700 Subject: make config --add behave correctly for empty and NULL values 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. Moreover, for "git config --add foo.bar roll", it will overwrite the original value instead of appending after the existing empty value. 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. For removing the segfault add a check for NULL values in `matches()` in config.c. Signed-off-by: Tanay Abhra Signed-off-by: Junio C Hamano --- config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config.c') diff --git a/config.c b/config.c index 2634457f6b..ffe010423d 100644 --- a/config.c +++ b/config.c @@ -1233,7 +1233,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) -- cgit v1.2.1