diff options
| author |   Kristaps Dzonsons <kristaps@bsd.lv> | 2010-06-09 20:00:38 +0000 |
|---|---|---|
| committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-06-09 20:00:38 +0000 |
| commit | f9e4d0ae086987ed162fde69bc3ae4c3048ff293 (patch) | |
| tree | 0472dd96d25d305fb0411e941e35c79c1295ee24 /roff.c | |
| parent | 1aea6f050761f70bdfd8647816b23774b971050c (diff) | |
| download | mandoc-f9e4d0ae086987ed162fde69bc3ae4c3048ff293.tar.gz mandoc-f9e4d0ae086987ed162fde69bc3ae4c3048ff293.tar.zst mandoc-f9e4d0ae086987ed162fde69bc3ae4c3048ff293.zip | |
Make "sub" for conditionals run roffnode_cleanscope() before calling
down to sub-arguments. From a bug report by Ulrich Spoerlein.
Diffstat (limited to 'roff.c')
| -rw-r--r-- | roff.c | 14 |
1 files changed, 12 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.86 2010/06/01 11:47:28 kristaps Exp $ */ +/* $Id: roff.c,v 1.87 2010/06/09 20:00:38 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -621,11 +621,21 @@ roff_cond_sub(ROFF_ARGS) { enum rofft t; enum roffrule rr; + struct roffnode *l; ppos = pos; rr = r->last->rule; - roff_cond_text(r, tok, bufp, szp, ln, ppos, pos, offs); + /* + * Clean out scope. If we've closed ourselves, then don't + * continue. + */ + + l = r->last; + roffnode_cleanscope(r); + + if (l != r->last) + return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); if (ROFF_MAX == (t = roff_parse(*bufp, &pos))) return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT); |