diff options
| author |   schwarze <schwarze@openbsd.org> | 2016-08-20 15:58:16 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2016-08-20 15:58:16 +0000 |
| commit | 57104dfd43a6bc418b81126b899a74a4877ef3c3 (patch) | |
| tree | facfdfb3fd0a8effa359cc81c8d95e13263a8877 /usr.bin/mandoc/mdoc_macro.c | |
| parent | Replace bcmmuart(4) with com(4). (diff) | |
| download | wireguard-openbsd-57104dfd43a6bc418b81126b899a74a4877ef3c3.tar.xz wireguard-openbsd-57104dfd43a6bc418b81126b899a74a4877ef3c3.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 'usr.bin/mandoc/mdoc_macro.c')
| -rw-r--r-- | usr.bin/mandoc/mdoc_macro.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c index 7bc6b7057b4..331aeb52903 100644 --- a/usr.bin/mandoc/mdoc_macro.c +++ b/usr.bin/mandoc/mdoc_macro.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_macro.c,v 1.163 2016/08/13 09:14:56 schwarze Exp $ */ +/* $OpenBSD: mdoc_macro.c,v 1.164 2016/08/20 15:58:16 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -1457,7 +1457,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; } |