diff options
| author | Ingo Schwarze <schwarze@openbsd.org> | 2017-02-16 09:47:31 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-02-16 09:47:31 +0000 |
| commit | 884a60b25e9e47062115672eba1e8ab234747909 (patch) | |
| tree | fad98de44d0bb6be0b72e84522cbf4389b723dd6 /regress/mdoc | |
| parent | b36c2e4756f2b576b474a61019f15645f0cf8388 (diff) | |
| download | mandoc-884a60b25e9e47062115672eba1e8ab234747909.tar.gz | |
Fix block scoping error if an explicit block is broken by two
implicit blocks (.Aq Bq Po .Pc) that left the outer breaker open
and could in exceptional cases, like between .Bl and .It, cause
tree corruption leading to NULL dereference.
Found by tb@ with afl(1).
While here, do not mark intermediate ENDBODY markers as broken.
Diffstat (limited to 'regress/mdoc')
| -rw-r--r-- | regress/mdoc/break/twice.in | 19 | ||||
| -rw-r--r-- | regress/mdoc/break/twice.out_ascii | 14 | ||||
| -rw-r--r-- | regress/mdoc/break/twice.out_lint | 3 |
3 files changed, 26 insertions, 10 deletions
diff --git a/regress/mdoc/break/twice.in b/regress/mdoc/break/twice.in index 8853aec1..a8dda93f 100644 --- a/regress/mdoc/break/twice.in +++ b/regress/mdoc/break/twice.in @@ -1,11 +1,11 @@ -.Dd February 12, 2015 +.Dd February 16, 2017 .Dt BREAK-TWICE 1 .Os OpenBSD .Sh NAME .Nm break-twice .Nd breaking the same block twice .Sh DESCRIPTION -Standard case, explicit: +Standard case, fully explicit: .Bo bo .Bro bro .Ao ao brc @@ -13,12 +13,12 @@ Standard case, explicit: .Bc ac .Ac .Pp -Standard case, implicit: +Standard case, implicit broken block: .Bo bo .Bro bro .Aq aq brc Brc bc Bc eol .Pp -Two of the same kind, explicit: +Two of the same kind, fully explicit: .Bo bo .Bo bo .Ao ao bc @@ -26,7 +26,16 @@ Two of the same kind, explicit: .Bc ac .Ac .Pp -Two of the same kind, implicit: +Two of the same kind, implicit broken block: .Bo bo .Bo bo .Aq aq bc Bc bc Bc eol +.Pp +Two implicit breakers: +.Bl -dash +.Aq aq Bq bq Po po +pc +.Pc +.It +it +.El diff --git a/regress/mdoc/break/twice.out_ascii b/regress/mdoc/break/twice.out_ascii index c6d0149d..75302910 100644 --- a/regress/mdoc/break/twice.out_ascii +++ b/regress/mdoc/break/twice.out_ascii @@ -4,12 +4,16 @@ NNAAMMEE bbrreeaakk--ttwwiiccee - breaking the same block twice DDEESSCCRRIIPPTTIIOONN - Standard case, explicit: [bo {bro <ao brc} bc] ac> + Standard case, fully explicit: [bo {bro <ao brc} bc] ac> - Standard case, implicit: [bo {bro <aq brc} bc] eol> + Standard case, implicit broken block: [bo {bro <aq brc} bc] eol> - Two of the same kind, explicit: [bo [bo <ao bc] bc] ac> + Two of the same kind, fully explicit: [bo [bo <ao bc] bc] ac> - Two of the same kind, implicit: [bo [bo <aq bc] bc] eol> + Two of the same kind, implicit broken block: [bo [bo <aq bc] bc] eol> -OpenBSD February 12, 2015 OpenBSD + Two implicit breakers: <aq [bq (po]> pc) + + -- it + +OpenBSD February 16, 2017 OpenBSD diff --git a/regress/mdoc/break/twice.out_lint b/regress/mdoc/break/twice.out_lint index 6ac976c0..150800e9 100644 --- a/regress/mdoc/break/twice.out_lint +++ b/regress/mdoc/break/twice.out_lint @@ -6,3 +6,6 @@ mandoc: twice.in:25:2: WARNING: blocks badly nested: Bo breaks Ao mandoc: twice.in:26:2: WARNING: blocks badly nested: Bo breaks Ao mandoc: twice.in:32:11: WARNING: blocks badly nested: Bo breaks Aq mandoc: twice.in:32:17: WARNING: blocks badly nested: Bo breaks Aq +mandoc: twice.in:36:8: WARNING: blocks badly nested: Bq breaks Po +mandoc: twice.in:36:2: WARNING: blocks badly nested: Aq breaks Po +mandoc: twice.in:36:2: WARNING: moving content out of list: Aq |