[PATCH 3/3] git_config_set_multivar_in_file: handle "unset" errors
- From
Jeff King <peff@peff.net>
- Date
- Apr 9, 2016, 17:43 UTC
- Message-ID
- <20160409174353.GC11873@sigill.intra.peff.net>
- In-Reply-To
- <20160409173904.GA5127@sigill.intra.peff.net>
We pass off to the "_gently" form to do the real work, and just die() if it returned an error. However, our die message de-references "value", which may be NULL if the request was to unset a variable. Nobody using glibc noticed, because it simply prints "(null)", which is good enough for the test suite (and presumably very few people run across this in practice). But other libc implementations (like Solaris) may segfault.
Let's not only fix that, but let's make the message more clear about what is going on in the "unset" case.
Reported-by: "Tom G. Christensen" <tgc@jupiterrise.com> Signed-off-by: Jeff King <peff@peff.net> --- config.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c index d446315..3fe40c3 100644 --- a/config.c +++ b/config.c @@ -2221,9 +2221,13 @@ void git_config_set_multivar_in_file(const char *config_filename, const char *key, const char *value, const char *value_regex, int multi_replace) { - if (git_config_set_multivar_in_file_gently(config_filename, key, value, - value_regex, multi_replace)) + if (!git_config_set_multivar_in_file_gently(config_filename, key, value, + value_regex, multi_replace)) + return; + if (value) die(_("could not set '%s' to '%s'"), key, value); + else + die(_("could not unset '%s'"), key); } int git_config_set_multivar_gently(const char *key, const char *value,
-- 2.8.1.245.g18e0f5c