From c5077d0d948740ac34e3edfe0d450cb54e4a57c4 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
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 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'manpath.c')

diff --git a/manpath.c b/manpath.c
index 6d67151b..324a77a9 100644
--- a/manpath.c
+++ b/manpath.c
@@ -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