[PATCH 1/5] notes-utils: handle boolean notes.rewritemode correctly
- From
John Keeping <john@keeping.me.uk>
- Date
- Feb 16, 2014, 16:06 UTC
- Message-ID
- <be9b384ec77fc39b939b8c5505862a6e1c641faa.1392565571.git.john@keeping.me.uk>
- In-Reply-To
- <cover.1392565571.git.john@keeping.me.uk>
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> --- notes-utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/notes-utils.c b/notes-utils.c index 2975dcd..4aa7023 100644 --- a/notes-utils.c +++ b/notes-utils.c @@ -75,7 +75,7 @@ static int notes_rewrite_config(const char *k, const char *v, void *cb) return 0; } else if (!c->mode_from_env && !strcmp(k, "notes.rewritemode")) { if (!v) - config_error_nonbool(k); + return config_error_nonbool(k); c->combine = parse_combine_notes_fn(v); if (!c->combine) { error(_("Bad notes.rewriteMode value: '%s'"), v);
-- 1.9.rc0.187.g6292fff