From de2a1122a661dd4bd4004854891d44e87d63c6c2 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Fri, 17 Aug 2018 20:33:37 +0000 Subject: Remove more pointer arithmetic passing via regions outside the array that is undefined according to the C standard. Robert Elz pointed out i wasn't quite done yet. --- mdoc_state.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'mdoc_state.c') diff --git a/mdoc_state.c b/mdoc_state.c index 2d8563f5..eaf20511 100644 --- a/mdoc_state.c +++ b/mdoc_state.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_state.c,v 1.9 2017/11/29 20:05:33 schwarze Exp $ */ +/* $Id: mdoc_state.c,v 1.10 2018/08/17 20:33:38 schwarze Exp $ */ /* * Copyright (c) 2014, 2015, 2017 Ingo Schwarze * @@ -36,7 +36,7 @@ static void state_dl(STATE_ARGS); static void state_sh(STATE_ARGS); static void state_sm(STATE_ARGS); -static const state_handler __state_handlers[MDOC_MAX - MDOC_Dd] = { +static const state_handler state_handlers[MDOC_MAX - MDOC_Dd] = { NULL, /* Dd */ NULL, /* Dt */ NULL, /* Os */ @@ -158,7 +158,6 @@ static const state_handler __state_handlers[MDOC_MAX - MDOC_Dd] = { NULL, /* %U */ NULL, /* Ta */ }; -static const state_handler *const state_handlers = __state_handlers - MDOC_Dd; void @@ -170,10 +169,10 @@ mdoc_state(struct roff_man *mdoc, struct roff_node *n) return; assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); - if ( ! (mdoc_macros[n->tok].flags & MDOC_PROLOGUE)) + if ((mdoc_macro(n->tok)->flags & MDOC_PROLOGUE) == 0) mdoc->flags |= MDOC_PBODY; - handler = state_handlers[n->tok]; + handler = state_handlers[n->tok - MDOC_Dd]; if (*handler) (*handler)(mdoc, n); } -- cgit v1.2.3-56-ge451