diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-13 14:45:50 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-13 14:45:50 +0000 |
| commit | 882b0df046673132c4d2d6f14969d087ead1d87c (patch) | |
| tree | 8278d398b2c5f52742f7333e887a1378725d743c /man_macro.c | |
| parent | 9460c128e40f65cfb15e776c2d51ea26f06b4ef7 (diff) | |
| download | mandoc-882b0df046673132c4d2d6f14969d087ead1d87c.tar.gz | |
Do not die on an assertion if an input file contains no section
whatsoever and ends with a broken next-line scope. Obviously, this
cannot happen in a real manual page, but mandoc(1) should not die
even when fed absurd input.
This bug was independently reported by both jsg@ and tb@ who both
found it with afl(1).
Diffstat (limited to 'man_macro.c')
| -rw-r--r-- | man_macro.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/man_macro.c b/man_macro.c index b040823a..e16a6a74 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,7 +1,7 @@ /* $Id$ */ /* + * Copyright (c) 2012-2015,2017-2020,2022 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2012-2015, 2017-2020 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> * * Permission to use, copy, modify, and distribute this software for any @@ -108,7 +108,8 @@ man_unscope(struct roff_man *man, const struct roff_node *to) n->line, n->pos, "EOF breaks %s", roff_name[n->tok]); if (man->flags & MAN_ELINE) { - if ((man_macro(n->parent->tok)->flags & + if (n->parent->type == ROFFT_ROOT || + (man_macro(n->parent->tok)->flags & MAN_ESCOPED) == 0) man->flags &= ~MAN_ELINE; } else { |