From 67beb600563cf28186f44450e528df1ec4d524fd Mon Sep 17 00:00:00 2001 From: Jeff King Date: Mon, 27 Jan 2014 20:37:30 -0500 Subject: [PATCH] handle_path_include: don't look at NULL value When we see config like: [include] path the expand_user_path helper notices that the config value is empty, but we then dereference NULL while printing the error message (glibc will helpfully print "(null)" for us here, but we cannot rely on that). $ git -c include.path rev-parse error: Could not expand include path '(null)' fatal: unable to parse command-line config Instead of tweaking our message, let's actually use config_error_nonbool to match other config variables that expect a value: $ git -c include.path rev-parse error: Missing value for 'include.path' fatal: unable to parse command-line config Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- config.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config.c b/config.c index 2bbf02d1e8..47ce8d8b8e 100644 --- a/config.c +++ b/config.c @@ -37,8 +37,12 @@ static int handle_path_include(const char *path, struct config_include_data *inc { int ret = 0; struct strbuf buf = STRBUF_INIT; - char *expanded = expand_user_path(path); + char *expanded; + if (!path) + return config_error_nonbool("include.path"); + + expanded = expand_user_path(path); if (!expanded) return error("Could not expand include path '%s'", path); path = expanded; -- 2.11.4.GIT