diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2020-09-09 17:01:10 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2020-09-09 17:01:10 +0000 |
| commit | 2d14351d07ed74373585b7cf8b4146d5b5c91ccb (patch) | |
| tree | ab3692958b73ce4bd51ba19a55eb8259e0f8542e /man_macro.c | |
| parent | 13e486a002b2f9dbb4dbe9afce062db1944d8185 (diff) | |
| download | mandoc-2d14351d07ed74373585b7cf8b4146d5b5c91ccb.tar.gz | |
Element next-line scopes can nest. Consequently, even when closing
one element next-line scope, the MAN_ELINE flag must not yet be
cleared if the parent macro is another element macro having next-line
scope, or an assertion failure is caused if all this is wrapped in
another macro that has block next-line scope, for example .TP.
Bug found in an afl run performed by Jan Schreiber <jes at posteo dot de>.
Diffstat (limited to 'man_macro.c')
| -rw-r--r-- | man_macro.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/man_macro.c b/man_macro.c index 7cc8a7e7..b040823a 100644 --- a/man_macro.c +++ b/man_macro.c @@ -1,7 +1,7 @@ -/* $Id$ */ +/* $Id$ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> - * Copyright (c) 2012-2015, 2017-2019 Ingo Schwarze <schwarze@openbsd.org> + * 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 @@ -107,9 +107,11 @@ man_unscope(struct roff_man *man, const struct roff_node *to) mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos, "EOF breaks %s", roff_name[n->tok]); - if (man->flags & MAN_ELINE) - man->flags &= ~MAN_ELINE; - else { + if (man->flags & MAN_ELINE) { + if ((man_macro(n->parent->tok)->flags & + MAN_ESCOPED) == 0) + man->flags &= ~MAN_ELINE; + } else { assert(n->type == ROFFT_HEAD); n = n->parent; man->flags &= ~MAN_BLINE; |