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 | ed556a16a0d0d619b59f20de7ff6e61eb00b0fde (patch) | |
| tree | 1cedd65b21f47ef6f80aaed8bbc22e378457bed3 /mdoc_macro.c | |
| parent | 7ecfd5e3557e3ab058790b07c004742041bb86e0 (diff) | |
| download | mandoc-ed556a16a0d0d619b59f20de7ff6e61eb00b0fde.tar.gz mandoc-ed556a16a0d0d619b59f20de7ff6e61eb00b0fde.tar.zst mandoc-ed556a16a0d0d619b59f20de7ff6e61eb00b0fde.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.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mdoc_macro.c b/mdoc_macro.c index eb7c78aa..8cde4e8f 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.117 2012/07/18 16:20:43 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.118 2012/11/16 13:40:36 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012 Ingo Schwarze <schwarze@openbsd.org> @@ -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; } |