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).

3 files changed, 28 insertions, 9 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Bl/break.in b/regress/usr.bin/mandoc/mdoc/Bl/break.in
index 03a85364bc4..3246fdc72ec 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/break.in
+++ b/regress/usr.bin/mandoc/mdoc/Bl/break.in
@@ -1,4 +1,4 @@
-.Dd December 18, 2014
+.Dd August 20, 2016
 .Dt BL-BREAK 1
 .Os OpenBSD
 .Sh NAME
@@ -55,6 +55,16 @@ first line after table
 second line after table
 .El
 after list
+.Sh DIAGNOSTICS
+.Bl -column column
+.It column
+.Bd -ragged -offset indent
+inside display
+.El
+.Ta stray tab
+after stray tab
+.Ed
+after display
 .Sh CAVEATS
 .Bl -hang
 .It before broken block Bo inside both
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii b/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii
index 30a6888b559..692711c4075 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bl/break.out_ascii
@@ -33,10 +33,17 @@ EEXXAAMMPPLLEESS
                       table after list
 
 
+DDIIAAGGNNOOSSTTIICCSS
+     column
+
+           inside display after stray tab
+
+     after display
+
 CCAAVVEEAATTSS
      before broken block [inside both after list]
 
 BBUUGGSS
      1.
 
-OpenBSD                        December 18, 2014                       OpenBSD
+OpenBSD                         August 20, 2016                        OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/break.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/break.out_lint
index 934b4c1dc11..fe099a470b0 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/break.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/break.out_lint
@@ -7,10 +7,12 @@ mandoc: break.in:42:2: ERROR: skipping item outside list: It
 mandoc: break.in:53:2: WARNING: blocks badly nested: Bl breaks Bd
 mandoc: break.in:56:2: WARNING: blocks badly nested: Bl breaks Bd
 mandoc: break.in:58:2: ERROR: inserting missing end of block: Sh breaks Bd
-mandoc: break.in:61:2: WARNING: blocks badly nested: Bl breaks Bo
-mandoc: break.in:63:2: ERROR: inserting missing end of block: Sh breaks Bo
-mandoc: break.in:66:2: WARNING: blocks badly nested: Bl breaks Bo
-mandoc: break.in:65:25: ERROR: appending missing end of block: Bo
-mandoc: break.in:64:2: ERROR: appending missing end of block: Bl
-mandoc: break.in:65:2: WARNING: empty list item: Bl -enum It
-mandoc: break.in:65:2: ERROR: skipping all arguments: It before broken block
+mandoc: break.in:63:2: WARNING: blocks badly nested: Bl breaks Bd
+mandoc: break.in:64:2: ERROR: skipping column outside column list: Ta
+mandoc: break.in:71:2: WARNING: blocks badly nested: Bl breaks Bo
+mandoc: break.in:73:2: ERROR: inserting missing end of block: Sh breaks Bo
+mandoc: break.in:76:2: WARNING: blocks badly nested: Bl breaks Bo
+mandoc: break.in:75:25: ERROR: appending missing end of block: Bo
+mandoc: break.in:74:2: ERROR: appending missing end of block: Bl
+mandoc: break.in:75:2: WARNING: empty list item: Bl -enum It
+mandoc: break.in:75:2: ERROR: skipping all arguments: It before broken block