From ca55ad44406efe64b843dd8c29dc03d4874c092a Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 3 May 2019 18:23:53 +0000 Subject: when processing unknown output options, prevent passing NULL to printf; patch from anton@ --- manpath.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/manpath.c b/manpath.c index 74f38a95..1446787a 100644 --- a/manpath.c +++ b/manpath.c @@ -1,4 +1,4 @@ -/* $Id: manpath.c,v 1.37 2018/11/22 11:30:23 schwarze Exp $ */ +/* $Id: manpath.c,v 1.38 2019/05/03 18:23:53 schwarze Exp $ */ /* * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze * Copyright (c) 2011 Kristaps Dzonsons @@ -235,12 +235,13 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile) "includes", "man", "paper", "style", "indent", "width", "tag", "fragment", "mdoc", "noval", "toc" }; + const size_t ntoks = sizeof(toks) / sizeof(toks[0]); const char *errstr; char *oldval; size_t len, tok; - for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) { + for (tok = 0; tok < ntoks; tok++) { len = strlen(toks[tok]); if ( ! strncmp(cp, toks[tok], len) && strchr(" = ", cp[len]) != NULL) { @@ -257,7 +258,7 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile) warnx("-O %s=?: Missing argument value", toks[tok]); return -1; } - if (tok > 6 && *cp != '\0') { + if (tok > 6 && tok < ntoks && *cp != '\0') { warnx("-O %s: Does not take a value: %s", toks[tok], cp); return -1; } -- cgit v1.2.3