release 1.14.3

[mandoc.git] / mdoc_state.c

diff --git a/mdoc_state.c b/mdoc_state.c
index 7fc76dcb4957d59650553e1b0b0d053cb2cc9fbe..d9cad18b1052d0f6fac82261a5a01ad337d732ce 100644 (file)
--- a/mdoc_state.c
+++ b/mdoc_state.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_state.c,v 1.2 2015/10/21 23:51:11 schwarze Exp $ */
+/*     $Id: mdoc_state.c,v 1.8 2017/05/05 15:17:32 schwarze Exp $ */
 /*
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2017 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
@@ -16,6 +16,7 @@
  */
 #include <sys/types.h>
 
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -35,8 +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] = {
-       NULL,           /* Ap */
+static const state_handler __state_handlers[MDOC_MAX - MDOC_Dd] = {
        NULL,           /* Dd */
        NULL,           /* Dt */
        NULL,           /* Os */
@@ -52,6 +52,7 @@ static        const state_handler state_handlers[MDOC_MAX] = {
        NULL,           /* It */
        NULL,           /* Ad */
        NULL,           /* An */
+       NULL,           /* Ap */
        NULL,           /* Ar */
        NULL,           /* Cd */
        NULL,           /* Cm */
@@ -154,12 +155,10 @@ static    const state_handler state_handlers[MDOC_MAX] = {
        NULL,           /* En */
        NULL,           /* Dx */
        NULL,           /* %Q */
-       NULL,           /* br */
-       NULL,           /* sp */
        NULL,           /* %U */
        NULL,           /* Ta */
-       NULL,           /* ll */
 };
+static const state_handler *const state_handlers = __state_handlers - MDOC_Dd;
 
 
 void
@@ -167,9 +166,10 @@ mdoc_state(struct roff_man *mdoc, struct roff_node *n)
 {
        state_handler handler;
 
-       if (n->tok == TOKEN_NONE)
+       if (n->tok == TOKEN_NONE || n->tok < ROFF_MAX)
                return;
 
+       assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
        if ( ! (mdoc_macros[n->tok].flags & MDOC_PROLOGUE))
                mdoc->flags |= MDOC_PBODY;
 
@@ -195,6 +195,9 @@ state_bd(STATE_ARGS)
            (n->type != ROFFT_BODY || n->end != ENDBODY_NOT))
                return;
 
+       if (n->parent->args == NULL)
+               return;
+
        arg = n->parent->args->argv[0].arg;
        if (arg != MDOC_Literal && arg != MDOC_Unfilled)
                return;
@@ -246,7 +249,7 @@ state_sh(STATE_ARGS)
        if (n->type != ROFFT_HEAD)
                return;
 
-       if ( ! (n->flags & MDOC_VALID)) {
+       if ( ! (n->flags & NODE_VALID)) {
                secname = NULL;
                deroff(&secname, n);