diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2012-11-16 13:40:36 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2012-11-16 13:40:36 +0000 |
| commit | c070642807053876d10f7d2e6a1e090eee114928 (patch) | |
| tree | 29a5070473f424b714804283b8903f225378626a /mdoc_macro.c | |
| parent | 6ec0e216bc7dde590b2d3a1eb4a382b7895f2a01 (diff) | |
| download | mandoc-c070642807053876d10f7d2e6a1e090eee114928.tar.gz | |
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.
Completed and tested at the OpenBSD impromptu Coimbra hackathon (c2k12).
Thanks to Pedro Almeida and the Laborat'orio de Computa,c~ao Avan,cada
da Universidade de Coimbra (http://www.uc.pt/lca) for their hospitality!
Diffstat (limited to 'mdoc_macro.c')
| -rw-r--r-- | mdoc_macro.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index 3e5d46af..29c6cff0 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -738,7 +738,7 @@ blk_exp_close(MACRO_PROT_ARGS) if (later && MDOC_EXPLICIT & mdoc_macros[later->tok].flags) continue; - if (MDOC_CALLABLE & mdoc_macros[n->tok].flags) + if (MDOC_It != n->tok) later = n; } |