diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2014-12-22 23:27:32 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-12-22 23:27:32 +0000 |
| commit | 49764a9c2f5aba1295cfa9bbd4749c62b4acade9 (patch) | |
| tree | e8b80a0850656cd75f8a5e8254da20aa507b1c1c | |
| parent | c9e8d526e302d7815cc3d5d2b42657a00dd2afe3 (diff) | |
| download | mandoc-49764a9c2f5aba1295cfa9bbd4749c62b4acade9.tar.gz | |
The code already pays attention not to close the same block twice.
Similarly, avoid having the same block break two other blocks.
In some situations, this could lead to an endless loop in rew_sub()
found by jsg@ with afl.
Minimal example: .Po Ao Pc Bo Pc Ac Bc
| -rw-r--r-- | mdoc_macro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 4ab58182..212a5df2 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -363,7 +363,7 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type, * When starting to rewind, skip plain text * and nodes that have already been rewound. */ - if (MDOC_TEXT == p->type || MDOC_VALID & p->flags) + if (p->type == MDOC_TEXT || p->flags & (MDOC_VALID | MDOC_BREAK)) return(REWIND_MORE); /* @@ -746,7 +746,7 @@ blk_exp_close(MACRO_PROT_ARGS) atok = rew_alt(tok); body = endbody = later = NULL; for (n = mdoc->last; n; n = n->parent) { - if (n->flags & MDOC_VALID) + if (n->flags & (MDOC_VALID | MDOC_BREAK)) continue; /* Remember the start of our own body. */ |