===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_macro.c,v
retrieving revision 1.132
retrieving revision 1.133
diff -c -r1.132 -r1.133
*** src/usr.bin/mandoc/mdoc_macro.c	2015/02/05 01:46:38	1.132
--- src/usr.bin/mandoc/mdoc_macro.c	2015/02/06 01:07:07	1.133
***************
*** 1,4 ****
! /*	$OpenBSD: mdoc_macro.c,v 1.132 2015/02/05 01:46:38 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mdoc_macro.c,v 1.133 2015/02/06 01:07:07 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 902,907 ****
--- 902,913 ----
  
  	nl = MDOC_NEWLINE & mdoc->flags;
  
+ 	if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
+ 		mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+ 		    line, ppos, mdoc_macronames[tok]);
+ 		return;
+ 	}
+ 
  	if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
  
  		/* Here, tok is one of Sh Ss Nm Nd It. */
***************
*** 1365,1370 ****
--- 1371,1381 ----
  	}
  
  	if (j == 0) {
+ 		if (tok == MDOC_In || tok == MDOC_St || tok == MDOC_Xr) {
+ 			mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+ 			    line, ppos, mdoc_macronames[tok]);
+ 			return;
+ 		}
  		mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
  		if (ac == ARGS_PUNCT && tok == MDOC_Pf)
  			append_delims(mdoc, line, pos, buf);