diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2019-05-03 18:23:53 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2019-05-03 18:23:53 +0000 |
commit | ca55ad44406efe64b843dd8c29dc03d4874c092a (patch) | |
tree | 1bb3a630da1135827d1f2932150d5914f0bb529a /manpath.c | |
parent | 8c6e6e7279fc3ad85066d3f459f4ac9289f096c0 (diff) | |
download | mandoc-ca55ad44406efe64b843dd8c29dc03d4874c092a.tar.gz mandoc-ca55ad44406efe64b843dd8c29dc03d4874c092a.tar.zst mandoc-ca55ad44406efe64b843dd8c29dc03d4874c092a.zip |
when processing unknown output options, prevent passing NULL to printf;
patch from anton@
Diffstat (limited to 'manpath.c')
-rw-r--r-- | manpath.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 <schwarze@openbsd.org> * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> @@ -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; } |