===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_state.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/mandoc/mdoc_state.c	2017/04/24 23:06:09	1.5
--- src/usr.bin/mandoc/mdoc_state.c	2017/05/04 17:48:24	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_state.c,v 1.5 2017/04/24 23:06:09 schwarze Exp $ */
  /*
   * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: mdoc_state.c,v 1.6 2017/05/04 17:48:24 schwarze Exp $ */
  /*
   * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
   *
***************
*** 16,21 ****
--- 16,22 ----
   */
  #include <sys/types.h>
  
+ #include <assert.h>
  #include <stdlib.h>
  #include <string.h>
  
***************
*** 154,160 ****
  	NULL,		/* En */
  	NULL,		/* Dx */
  	NULL,		/* %Q */
- 	NULL,		/* br */
  	NULL,		/* sp */
  	NULL,		/* %U */
  	NULL,		/* Ta */
--- 155,160 ----
***************
*** 168,176 ****
  {
  	state_handler handler;
  
! 	if (n->tok == TOKEN_NONE)
  		return;
  
  	if ( ! (mdoc_macros[n->tok].flags & MDOC_PROLOGUE))
  		mdoc->flags |= MDOC_PBODY;
  
--- 168,177 ----
  {
  	state_handler handler;
  
! 	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;