Make "sub" for conditionals run roffnode_cleanscope() before calling

down to sub-arguments.  From a bug report by Ulrich Spoerlein.

1 files changed, 11 insertions, 1 deletions

diff --git a/roff.c b/roff.c
index f6c85c7a..a3a5b550 100644
--- a/roff.c
+++ b/roff.c
@@ -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);