diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-02-11 15:47:16 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-02-11 15:47:16 +0000 |
| commit | da6a1e98d4d54579484b18918cfbec3bc1ce214d (patch) | |
| tree | a3fc7b63d13c97371b721d9c904864735ea93feb | |
| parent | f1acc1f1ed19c62e0f3916a557e5841e0392cd7a (diff) | |
| download | mandoc-da6a1e98d4d54579484b18918cfbec3bc1ce214d.tar.gz mandoc-da6a1e98d4d54579484b18918cfbec3bc1ce214d.tar.zst mandoc-da6a1e98d4d54579484b18918cfbec3bc1ce214d.zip | |
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
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | mdoc_macro.c | 9 |
2 files changed, 8 insertions, 5 deletions
@@ -1,4 +1,4 @@ -$Id: NEWS,v 1.17 2017/02/11 14:11:17 schwarze Exp $ +$Id: NEWS,v 1.18 2017/02/11 15:47:16 schwarze Exp $ This file lists the most important changes in the mdocml.bsd.lv distribution. @@ -49,6 +49,8 @@ Changes in version 1.14.1, released on February XXX, 2017 * man(1): Fix NULL dereference when the first of multiple pages shown was preformatted. * mdoc(7): Fix syntax tree corruption leading to NULL dereference + caused by partial implicit macros inside .Bl -column table cells. + * mdoc(7): Fix syntax tree corruption leading to NULL dereference for macro sequences like .Bl .Bl .It Bo .El .It. * mdoc(7): Fix syntax tree corruption leading to NULL dereference caused by .Ta following a nested .Bl -column breaking another block. 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 <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org> @@ -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); |