diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-24 17:40:22 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2022-04-24 17:40:22 +0000 |
commit | 585346697024b5a41297196991bebef97f11a26a (patch) | |
tree | a55bd402508612748a111bed2f3d1e6a0640682a | |
parent | 3b18ea9139a1bdd9183db6f3ac6d174ad93b3cb3 (diff) | |
download | mandoc-585346697024b5a41297196991bebef97f11a26a.tar.gz mandoc-585346697024b5a41297196991bebef97f11a26a.tar.zst mandoc-585346697024b5a41297196991bebef97f11a26a.zip |
When we open a new .while loop, let's not attempt to close out
another enclosing .while loop at the same time.
Instead, postpone the closing until the next iteration of ROFF_RERUN.
This prevents one-line constructions like ".while 0 .while 0 something"
and ".while rx .while rx .rr x" (which admittedly aren't particularly
useful) from dying of abort(3), which was a bug tb@ found with afl(1).
-rw-r--r-- | roff.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.382 2022/04/24 13:38:46 schwarze Exp $ */ +/* $Id: roff.c,v 1.383 2022/04/24 17:40:22 schwarze Exp $ */ /* * Copyright (c) 2010-2015, 2017-2022 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2008-2012, 2014 Kristaps Dzonsons <kristaps@bsd.lv> @@ -2433,9 +2433,11 @@ roff_cond_sub(ROFF_ARGS) } } } else if (t != TOKEN_NONE && - (rr || roffs[t].flags & ROFFMAC_STRUCT)) + (rr || roffs[t].flags & ROFFMAC_STRUCT)) { irc |= (*roffs[t].proc)(r, t, buf, ln, ppos, pos, offs); - else + if (irc & ROFF_WHILE) + irc &= ~(ROFF_LOOPCONT | ROFF_LOOPEXIT); + } else irc |= rr ? ROFF_CONT : ROFF_IGN; return irc; } |