undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notes-utils: handle boolean notes.rewritemode correctly

Browse Source 
If we carry on after outputting config_error_nonbool then we're
guaranteed to dereference a null pointer.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
John Keeping 2014-02-16 16:06:02 +00:00 committed by Junio C Hamano
parent 5f95c9f850
commit aa012e9065
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
notes-utils.c
View File

@ -75,7 +75,7 @@ static int notes_rewrite_config(const char *k, const char *v, void *cb)
return 0; return 0;
} else if (!c->mode_from_env && !strcmp(k, "notes.rewritemode")) { } else if (!c->mode_from_env && !strcmp(k, "notes.rewritemode")) {
if (!v) if (!v)
config_error_nonbool(k); return config_error_nonbool(k);
c->combine = parse_combine_notes_fn(v); c->combine = parse_combine_notes_fn(v);
if (!c->combine) { if (!c->combine) {
error(_("Bad notes.rewriteMode value: '%s'"), v); error(_("Bad notes.rewriteMode value: '%s'"), v);