diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-06-28 12:52:45 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-06-28 12:52:45 +0000 |
| commit | 83eae95b1f484ce2385add3cd89048c3ba3da7f4 (patch) | |
| tree | 9b68a82c9b7d6287940341c62511cf6bad15fb73 /man.c | |
| parent | 799fe6e9c220058713c9bd7ae54646d631c454e1 (diff) | |
| download | mandoc-83eae95b1f484ce2385add3cd89048c3ba3da7f4.tar.gz mandoc-83eae95b1f484ce2385add3cd89048c3ba3da7f4.tar.zst mandoc-83eae95b1f484ce2385add3cd89048c3ba3da7f4.zip | |
fix incomplete handling of roff(7) nodes in man(7) block next-line scope;
assertion failure in tclsh(1) reported by deraadt@ via bentley@
Diffstat (limited to 'man.c')
| -rw-r--r-- | man.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.175 2017/06/17 13:06:16 schwarze Exp $ */ +/* $Id: man.c,v 1.176 2017/06/28 12:52:45 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> @@ -282,8 +282,10 @@ man_breakscope(struct roff_man *man, int tok) if (man->flags & MAN_ELINE && (tok < MAN_TH || ! (man_macros[tok].flags & MAN_NSCOPED))) { n = man->last; - assert(n->type != ROFFT_TEXT); - if (man_macros[n->tok].flags & MAN_NSCOPED) + if (n->type == ROFFT_TEXT) + n = n->parent; + if (n->tok < MAN_TH || + man_macros[n->tok].flags & MAN_NSCOPED) n = n->parent; mandoc_vmsg(MANDOCERR_BLK_LINE, man->parse, @@ -319,7 +321,8 @@ man_breakscope(struct roff_man *man, int tok) n = man->last; if (n->type == ROFFT_TEXT) n = n->parent; - if ( ! (man_macros[n->tok].flags & MAN_BSCOPE)) + if (n->tok < MAN_TH || + (man_macros[n->tok].flags & MAN_BSCOPE) == 0) n = n->parent; assert(n->type == ROFFT_HEAD); |