diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2016-08-20 15:58:21 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2016-08-20 15:58:21 +0000 |
| commit | 1062122d08562f12eb473c7eb80d28f711b0d65d (patch) | |
| tree | 5a4fd13bab5c769fa5f5dce73a0ca89af57174d7 /mdoc_macro.c | |
| parent | d9fc4466dfe11ea393b124444b1eb4041db86b6d (diff) | |
| download | mandoc-1062122d08562f12eb473c7eb80d28f711b0d65d.tar.gz mandoc-1062122d08562f12eb473c7eb80d28f711b0d65d.tar.zst mandoc-1062122d08562f12eb473c7eb80d28f711b0d65d.zip | |
When scanning upwards for a column list to put a .Ta macro in,
ignore body end markers of lists breaking other blocks.
Fixing a logical error that caused a NULL deref found by tb@ with afl(1).
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 7c535760..61e5d482 100644 --- a/mdoc_macro.c +++ b/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_macro.c,v 1.207 2016/08/11 13:30:25 schwarze Exp $ */ +/* $Id: mdoc_macro.c,v 1.208 2016/08/20 15:58:21 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -1459,7 +1459,7 @@ phrase_ta(MACRO_PROT_ARGS) continue; if (n->tok == MDOC_It && n->type == ROFFT_BODY) body = n; - if (n->tok == MDOC_Bl) + if (n->tok == MDOC_Bl && n->end == ENDBODY_NOT) break; } |