Do not read past the end of the buffer if an "f" layout font modifier

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 042d133df3021e8b222b0c846863b54c285b599d..c86ab6f13f01bcccf014c34e34dc3a492102d5d2 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.93 2015/01/24 01:58:33 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.98 2015/02/06 11:54:36 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -72,7 +72,6 @@ const struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
-       { in_line_eoln, MAN_NSCOPED }, /* na */
        { in_line_eoln, MAN_NSCOPED }, /* sp */
        { in_line_eoln, MAN_BSCOPE }, /* nf */
        { in_line_eoln, MAN_BSCOPE }, /* fi */
@@ -320,38 +319,43 @@ blk_close(MACRO_PROT_ARGS)
                mandoc_msg(MANDOCERR_BLK_NOTOPEN, man->parse,
                    line, ppos, man_macronames[tok]);
                rew_scope(MAN_BLOCK, man, MAN_PP);
-       } else
+       } else {
+               line = man->last->line;
+               ppos = man->last->pos;
+               ntok = man->last->tok;
                man_unscope(man, nn);
+
+               /* Move a trailing paragraph behind the block. */
+
+               if (ntok == MAN_LP || ntok == MAN_PP || ntok == MAN_P) {
+                       *pos = strlen(buf);
+                       blk_imp(man, ntok, line, ppos, pos, buf);
+               }
+       }
 }
 
 void
 blk_exp(MACRO_PROT_ARGS)
 {
-       struct man_node *n;
-       int              la;
+       struct man_node *head;
        char            *p;
+       int              la;
 
        rew_scope(MAN_BLOCK, man, tok);
        man_block_alloc(man, line, ppos, tok);
        man_head_alloc(man, line, ppos, tok);
+       head = man->last;
 
-       for (;;) {
-               la = *pos;
-               if ( ! man_args(man, line, pos, buf, &p))
-                       break;
+       la = *pos;
+       if (man_args(man, line, pos, buf, &p))
                man_word_alloc(man, line, la, p);
-       }
-
-       assert(man);
-       assert(tok != MAN_MAX);
 
-       for (n = man->last; n; n = n->parent)
-               if (n->tok == tok) {
-                       assert(n->type == MAN_HEAD);
-                       man_unscope(man, n);
-                       break;
-               }
+       if (buf[*pos] != '\0')
+               mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+                   man->parse, line, *pos, "%s ... %s",
+                   man_macronames[tok], buf + *pos);
 
+       man_unscope(man, head);
        man_body_alloc(man, line, ppos, tok);
 }
 
@@ -410,6 +414,20 @@ in_line_eoln(MACRO_PROT_ARGS)
        n = man->last;
 
        for (;;) {
+               if (buf[*pos] != '\0' && (tok == MAN_br ||
+                   tok == MAN_fi || tok == MAN_nf)) {
+                       mandoc_vmsg(MANDOCERR_ARG_SKIP,
+                           man->parse, line, *pos, "%s %s",
+                           man_macronames[tok], buf + *pos);
+                       break;
+               }
+               if (buf[*pos] != '\0' && man->last != n &&
+                   (tok == MAN_PD || tok == MAN_ft || tok == MAN_sp)) {
+                       mandoc_vmsg(MANDOCERR_ARG_EXCESS,
+                           man->parse, line, *pos, "%s ... %s",
+                           man_macronames[tok], buf + *pos);
+                       break;
+               }
                la = *pos;
                if ( ! man_args(man, line, pos, buf, &p))
                        break;