diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2018-08-17 20:33:37 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2018-08-17 20:33:37 +0000 |
| commit | de2a1122a661dd4bd4004854891d44e87d63c6c2 (patch) | |
| tree | 79380a193e1374fd7e4b697152b0b7aea304ddf8 /mdoc_argv.c | |
| parent | 3f485a7ff74c3707363ed47362ccc8a7855b0f58 (diff) | |
| download | mandoc-de2a1122a661dd4bd4004854891d44e87d63c6c2.tar.gz mandoc-de2a1122a661dd4bd4004854891d44e87d63c6c2.tar.zst mandoc-de2a1122a661dd4bd4004854891d44e87d63c6c2.zip | |
Remove more pointer arithmetic passing via regions outside the array
that is undefined according to the C standard. Robert Elz <kre at
munnari dot oz dot au> pointed out i wasn't quite done yet.
Diffstat (limited to 'mdoc_argv.c')
| -rw-r--r-- | mdoc_argv.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mdoc_argv.c b/mdoc_argv.c index db4c63f0..6fae24df 100644 --- a/mdoc_argv.c +++ b/mdoc_argv.c @@ -1,7 +1,7 @@ -/* $Id: mdoc_argv.c,v 1.115 2017/05/30 16:22:03 schwarze Exp $ */ +/* $Id: mdoc_argv.c,v 1.116 2018/08/17 20:33:37 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org> * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -144,7 +144,7 @@ static const enum mdocargt args_Bl[] = { MDOC_ARG_MAX }; -static const struct mdocarg __mdocargs[MDOC_MAX - MDOC_Dd] = { +static const struct mdocarg mdocargs[MDOC_MAX - MDOC_Dd] = { { ARGSFL_NONE, NULL }, /* Dd */ { ARGSFL_NONE, NULL }, /* Dt */ { ARGSFL_NONE, NULL }, /* Os */ @@ -266,7 +266,6 @@ static const struct mdocarg __mdocargs[MDOC_MAX - MDOC_Dd] = { { ARGSFL_NONE, NULL }, /* %U */ { ARGSFL_NONE, NULL }, /* Ta */ }; -static const struct mdocarg *const mdocargs = __mdocargs - MDOC_Dd; /* @@ -290,7 +289,7 @@ mdoc_argv(struct roff_man *mdoc, int line, enum roff_tok tok, /* Which flags does this macro support? */ assert(tok >= MDOC_Dd && tok < MDOC_MAX); - argtable = mdocargs[tok].argvs; + argtable = mdocargs[tok - MDOC_Dd].argvs; if (argtable == NULL) return; @@ -368,7 +367,7 @@ mdoc_argv(struct roff_man *mdoc, int line, enum roff_tok tok, /* Prepare for parsing the next flag. */ *pos = ipos; - argtable = mdocargs[tok].argvs; + argtable = mdocargs[tok - MDOC_Dd].argvs; } } @@ -422,7 +421,7 @@ mdoc_args(struct roff_man *mdoc, int line, int *pos, if (v == NULL) v = &v_local; - fl = tok == TOKEN_NONE ? ARGSFL_NONE : mdocargs[tok].flags; + fl = tok == TOKEN_NONE ? ARGSFL_NONE : mdocargs[tok - MDOC_Dd].flags; /* * We know that we're in an `It', so it's reasonable to expect |