From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 28181 invoked from network); 9 Sep 2020 17:01:16 -0000 Received: from bsd.lv (HELO mandoc.bsd.lv) (66.111.2.12) by inbox.vuxu.org with ESMTPUTF8; 9 Sep 2020 17:01:16 -0000 Received: from fantadrom.bsd.lv (localhost [127.0.0.1]) by mandoc.bsd.lv (OpenSMTPD) with ESMTP id c1d9af87 for ; Wed, 9 Sep 2020 12:01:14 -0500 (EST) Received: from localhost (mandoc.bsd.lv [local]) by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id c1534045 for ; Wed, 9 Sep 2020 12:01:13 -0500 (EST) Date: Wed, 9 Sep 2020 12:01:13 -0500 (EST) X-Mailinglist: mandoc-source Reply-To: source@mandoc.bsd.lv MIME-Version: 1.0 From: schwarze@mandoc.bsd.lv To: source@mandoc.bsd.lv Subject: mandoc: Element next-line scopes can nest. X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-ID: Log Message: ----------- Element next-line scopes can nest. Consequently, even when closing one element next-line scope, the MAN_ELINE flag must not yet be cleared if the parent macro is another element macro having next-line scope, or an assertion failure is caused if all this is wrapped in another macro that has block next-line scope, for example .TP. Bug found in an afl run performed by Jan Schreiber . Modified Files: -------------- mandoc: man_macro.c mandoc/regress/man/TP: broken.in broken.out_ascii broken.out_lint macrotag.in macrotag.out_ascii Revision Data ------------- Index: man_macro.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/man_macro.c,v retrieving revision 1.144 retrieving revision 1.145 diff -Lman_macro.c -Lman_macro.c -u -p -r1.144 -r1.145 --- man_macro.c +++ man_macro.c @@ -1,7 +1,7 @@ -/* $Id$ */ +/* $Id$ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2012-2015, 2017-2019 Ingo Schwarze + * Copyright (c) 2012-2015, 2017-2020 Ingo Schwarze * Copyright (c) 2013 Franco Fichtner * * Permission to use, copy, modify, and distribute this software for any @@ -107,9 +107,11 @@ man_unscope(struct roff_man *man, const mandoc_msg(MANDOCERR_BLK_LINE, n->line, n->pos, "EOF breaks %s", roff_name[n->tok]); - if (man->flags & MAN_ELINE) - man->flags &= ~MAN_ELINE; - else { + if (man->flags & MAN_ELINE) { + if ((man_macro(n->parent->tok)->flags & + MAN_ESCOPED) == 0) + man->flags &= ~MAN_ELINE; + } else { assert(n->type == ROFFT_HEAD); n = n->parent; man->flags &= ~MAN_BLINE; Index: broken.out_ascii =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TP/broken.out_ascii,v retrieving revision 1.2 retrieving revision 1.3 diff -Lregress/man/TP/broken.out_ascii -Lregress/man/TP/broken.out_ascii -u -p -r1.2 -r1.3 --- regress/man/TP/broken.out_ascii +++ regress/man/TP/broken.out_ascii @@ -3,7 +3,7 @@ TP-BROKEN(1) General Comm NNAAMMEE - TP-broken - broken tagged paragraph + TP-broken - broken tagged paragraphs DDEESSCCRRIIPPTTIIOONN regular text @@ -14,4 +14,4 @@ DDEESSCCRRIIPPTTIIOONN -OpenBSD December 16, 2014 TP-BROKEN(1) +OpenBSD September 9, 2020 TP-BROKEN(1) Index: macrotag.in =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TP/macrotag.in,v retrieving revision 1.2 retrieving revision 1.3 diff -Lregress/man/TP/macrotag.in -Lregress/man/TP/macrotag.in -u -p -r1.2 -r1.3 --- regress/man/TP/macrotag.in +++ regress/man/TP/macrotag.in @@ -1,12 +1,24 @@ -.\" $OpenBSD: macrotag.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $ -.TH TP-MACROTAG 1 "September 20, 2011" +.\" $OpenBSD: macrotag.in,v 1.4 2020/09/09 16:57:05 schwarze Exp $ +.TH TP-MACROTAG 1 "September 9, 2020" .SH NAME -TP-macrotag \- macro in the head of a tagged paragraph +TP-macrotag \- macros in the head of tagged paragraphs .SH DESCRIPTION regular text .TP .B longindent +indented +text +.TP +.B +.I +next-line +indented +text +.TP +.B +.SM +bold small indented text .PP Index: macrotag.out_ascii =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TP/macrotag.out_ascii,v retrieving revision 1.1 retrieving revision 1.2 diff -Lregress/man/TP/macrotag.out_ascii -Lregress/man/TP/macrotag.out_ascii -u -p -r1.1 -r1.2 --- regress/man/TP/macrotag.out_ascii +++ regress/man/TP/macrotag.out_ascii @@ -3,7 +3,7 @@ TP-MACROTAG(1) General Comm NNAAMMEE - TP-macrotag - macro in the head of a tagged paragraph + TP-macrotag - macros in the head of tagged paragraphs DDEESSCCRRIIPPTTIIOONN regular text @@ -11,8 +11,14 @@ DDEESSCCRRIIPPTTIIOONN lloonnggiinnddeenntt indented text + _n_e_x_t_-_l_i_n_e + indented text + + bboolldd ssmmaallll + indented text + regular text -OpenBSD September 20, 2011 TP-MACROTAG(1) +OpenBSD September 9, 2020 TP-MACROTAG(1) Index: broken.in =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TP/broken.in,v retrieving revision 1.3 retrieving revision 1.4 diff -Lregress/man/TP/broken.in -Lregress/man/TP/broken.in -u -p -r1.3 -r1.4 --- regress/man/TP/broken.in +++ regress/man/TP/broken.in @@ -1,7 +1,7 @@ -.\" $OpenBSD: broken.in,v 1.3 2017/07/04 14:53:24 schwarze Exp $ -.TH TP-BROKEN 1 "December 16, 2014" +.\" $OpenBSD: broken.in,v 1.4 2020/09/09 16:57:05 schwarze Exp $ +.TH TP-BROKEN 1 "September 9, 2020" .SH NAME -TP-broken \- broken tagged paragraph +TP-broken \- broken tagged paragraphs .SH DESCRIPTION regular text @@ -16,3 +16,6 @@ text head body +.TP +.B +.I Index: broken.out_lint =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TP/broken.out_lint,v retrieving revision 1.5 retrieving revision 1.6 diff -Lregress/man/TP/broken.out_lint -Lregress/man/TP/broken.out_lint -u -p -r1.5 -r1.6 --- regress/man/TP/broken.out_lint +++ regress/man/TP/broken.out_lint @@ -1,2 +1,5 @@ mandoc: broken.in:11:2: WARNING: line scope broken: RE breaks TP mandoc: broken.in:16:1: WARNING: skipping blank line in line scope +mandoc: broken.in:21:2: WARNING: line scope broken: EOF breaks I +mandoc: broken.in:20:2: WARNING: line scope broken: EOF breaks B +mandoc: broken.in:19:2: WARNING: line scope broken: EOF breaks TP -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv