From: nate@roosteregg.cc Date: Mon, 23 Nov 2020 03:23:41 GMT Subject: [PATCH 1/2] notes.c: fix a segfault in notes_display_config() Message-ID: <20201123032342.24566-2-nate@roosteregg.cc> In-Reply-To: <20201123032342.24566-1-nate@roosteregg.cc> From: Nate Avers If notes.displayRef is configured with no value[1], control should be returned to the caller when notes.c:notes_display_config() checks if 'v' is NULL. Otherwise, both git log --notes and git diff-tree --notes will subsequently segfault when refs.h:has_glob_specials() calls strpbrk() with a NULL first argument. [1] Examples: .git/config: [notes] displayRef $ git -c notes.displayRef [...] Signed-off-by: Nate Avers --- notes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notes.c b/notes.c index 564baac64d..d5ac081e76 100644 --- a/notes.c +++ b/notes.c @@ -970,7 +970,7 @@ static int notes_display_config(const char *k, const char *v, void *cb) if (*load_refs && !strcmp(k, "notes.displayref")) { if (!v) - config_error_nonbool(k); + return config_error_nonbool(k); string_list_add_refs_by_glob(&display_notes_refs, v); } -- 2.27.0