diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2015-02-06 01:07:22 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-02-06 01:07:22 +0000 |
| commit | e1808a26399ba483775f0653731559b644cc6f0f (patch) | |
| tree | 9aba4cd57641891357436652945f5089d623dcbe /mdoc_macro.c | |
| parent | 068bdebaf39570b6a01506886f67b47bbb8e6fd2 (diff) | |
| download | mandoc-e1808a26399ba483775f0653731559b644cc6f0f.tar.gz mandoc-e1808a26399ba483775f0653731559b644cc6f0f.tar.zst mandoc-e1808a26399ba483775f0653731559b644cc6f0f.zip | |
better handle .In .Sh .Ss .St .Xr without arguments
Diffstat (limited to 'mdoc_macro.c')
| -rw-r--r-- | mdoc_macro.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index b9abaf5d..8bc79919 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.176 2015/02/05 01:46:56 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.177 2015/02/06 01:07:22 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -904,6 +904,12 @@ blk_full(MACRO_PROT_ARGS) 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. */ @@ -1367,6 +1373,11 @@ in_line_argn(MACRO_PROT_ARGS) } 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); |