diff options
| author |   schwarze <schwarze@openbsd.org> | 2012-11-16 13:25:34 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2012-11-16 13:25:34 +0000 |
| commit | 606f14935ad56c181dc4337ef62904edfef33f45 (patch) | |
| tree | 65147d516498ac097fcc476c058e41d936707b8f /usr.bin/mandoc/mdoc.c | |
| parent | two spelling fixes; from John-Mark Gurney (freebsd -r243048); (diff) | |
| download | wireguard-openbsd-606f14935ad56c181dc4337ef62904edfef33f45.tar.xz wireguard-openbsd-606f14935ad56c181dc4337ef62904edfef33f45.zip | |
Fix a crash triggered by .Bl -tag .It Xo .El .Sh found by florian@.
* When allocating a body end marker, copy the pointer to the normalized
block information from the body block, avoiding the risk of subsequent
null pointer derefence.
* When inserting the body end marker into the syntax tree, do not try to
copy that pointer from the parent block, because not being a direkt child
of the block it belongs to is the whole point of a body end marker.
* Even non-callable blocks (like Bd and Bl) can break other blocks;
when this happens, postpone closing them out in the usual way.
Diffstat (limited to 'usr.bin/mandoc/mdoc.c')
| -rw-r--r-- | usr.bin/mandoc/mdoc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/mandoc/mdoc.c b/usr.bin/mandoc/mdoc.c index 9ffc5dab783..c5171c49d66 100644 --- a/usr.bin/mandoc/mdoc.c +++ b/usr.bin/mandoc/mdoc.c @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.91 2012/07/18 11:09:30 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.92 2012/11/16 13:25:34 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org> @@ -371,6 +371,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p) switch (p->type) { case (MDOC_BODY): + if (ENDBODY_NOT != p->end) + break; /* FALLTHROUGH */ case (MDOC_TAIL): /* FALLTHROUGH */ @@ -497,6 +499,7 @@ mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok, p = node_alloc(m, line, pos, tok, MDOC_BODY); p->pending = body; + p->norm = body->norm; p->end = end; if ( ! node_append(m, p)) return(0); |