From da6a1e98d4d54579484b18918cfbec3bc1ce214d Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 11 Feb 2017 15:47:16 +0000 Subject: Never look for broken blocks inside blocks that are already closed. Fixes the last the of tree corruptions sometimes causing NULL dereference reported by tb@; this one triggered in cases like: .Bl -column .It Pq Ta --- mdoc_macro.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mdoc_macro.c') diff --git a/mdoc_macro.c b/mdoc_macro.c index a1cea0ef..dedff380 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.214 2017/02/11 14:11:17 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.215 2017/02/11 15:47:16 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons * Copyright (c) 2010, 2012-2016 Ingo Schwarze @@ -400,6 +400,9 @@ find_pending(struct roff_man *mdoc, int tok, int line, int ppos, struct roff_node *n; int irc; + if (target->flags & NODE_VALID) + return 0; + irc = 0; for (n = mdoc->last; n != NULL && n != target; n = n->parent) { if (n->flags & NODE_ENDED) @@ -733,9 +736,7 @@ blk_exp_close(MACRO_PROT_ARGS) do target = target->parent; while ( ! (target->flags & NODE_ENDED)); - if ( ! (target->flags & NODE_VALID)) - pending = find_pending(mdoc, ntok, - line, ppos, target); + pending = find_pending(mdoc, ntok, line, ppos, target); } if ( ! pending) rew_pending(mdoc, n); -- cgit v1.2.3-56-ge451