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=T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 8832 invoked from network); 13 Apr 2022 14:45:55 -0000 Received: from bsd.lv (HELO mandoc.bsd.lv) (66.111.2.12) by inbox.vuxu.org with ESMTPUTF8; 13 Apr 2022 14:45:55 -0000 Received: from fantadrom.bsd.lv (localhost [127.0.0.1]) by mandoc.bsd.lv (OpenSMTPD) with ESMTP id df1d8eb8 for ; Wed, 13 Apr 2022 09:45:52 -0500 (EST) Received: from localhost (mandoc.bsd.lv [local]) by mandoc.bsd.lv (OpenSMTPD) with ESMTPA id bb612e3e for ; Wed, 13 Apr 2022 09:45:52 -0500 (EST) Date: Wed, 13 Apr 2022 09:45:52 -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: Do not die on an assertion if an input file contains no section X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Message-ID: <33650121c4f4f865@mandoc.bsd.lv> Log Message: ----------- Do not die on an assertion if an input file contains no section whatsoever and ends with a broken next-line scope. Obviously, this cannot happen in a real manual page, but mandoc(1) should not die even when fed absurd input. This bug was independently reported by both jsg@ and tb@ who both found it with afl(1). Modified Files: -------------- mandoc: man_macro.c mandoc/regress/man/TH: nobody.in nobody.out_ascii nobody.out_lint Revision Data ------------- Index: man_macro.c =================================================================== RCS file: /home/cvs/mandoc/mandoc/man_macro.c,v retrieving revision 1.145 retrieving revision 1.146 diff -Lman_macro.c -Lman_macro.c -u -p -r1.145 -r1.146 --- man_macro.c +++ man_macro.c @@ -1,7 +1,7 @@ /* $Id$ */ /* + * Copyright (c) 2012-2015,2017-2020,2022 Ingo Schwarze * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons - * Copyright (c) 2012-2015, 2017-2020 Ingo Schwarze * Copyright (c) 2013 Franco Fichtner * * Permission to use, copy, modify, and distribute this software for any @@ -108,7 +108,8 @@ man_unscope(struct roff_man *man, const n->line, n->pos, "EOF breaks %s", roff_name[n->tok]); if (man->flags & MAN_ELINE) { - if ((man_macro(n->parent->tok)->flags & + if (n->parent->type == ROFFT_ROOT || + (man_macro(n->parent->tok)->flags & MAN_ESCOPED) == 0) man->flags &= ~MAN_ELINE; } else { Index: nobody.in =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TH/nobody.in,v retrieving revision 1.2 retrieving revision 1.3 diff -Lregress/man/TH/nobody.in -Lregress/man/TH/nobody.in -u -p -r1.2 -r1.3 --- regress/man/TH/nobody.in +++ regress/man/TH/nobody.in @@ -1,2 +1,3 @@ -.\" $OpenBSD: nobody.in,v 1.2 2017/07/04 14:53:24 schwarze Exp $ -.TH TH-NOBODY 1 "June 20, 2014" +.\" $OpenBSD: nobody.in,v 1.3 2022/04/13 14:37:34 schwarze Exp $ +.TH TH-NOBODY 1 "April 13, 2022" +.B Index: nobody.out_lint =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TH/nobody.out_lint,v retrieving revision 1.4 retrieving revision 1.5 diff -Lregress/man/TH/nobody.out_lint -Lregress/man/TH/nobody.out_lint -u -p -r1.4 -r1.5 --- regress/man/TH/nobody.out_lint +++ regress/man/TH/nobody.out_lint @@ -1 +1,2 @@ +mandoc: nobody.in:3:2: WARNING: line scope broken: EOF breaks B mandoc: nobody.in: WARNING: no document body Index: nobody.out_ascii =================================================================== RCS file: /home/cvs/mandoc/mandoc/regress/man/TH/nobody.out_ascii,v retrieving revision 1.2 retrieving revision 1.3 diff -Lregress/man/TH/nobody.out_ascii -Lregress/man/TH/nobody.out_ascii -u -p -r1.2 -r1.3 --- regress/man/TH/nobody.out_ascii +++ regress/man/TH/nobody.out_ascii @@ -1,3 +1,3 @@ TH-NOBODY(1) General Commands Manual TH-NOBODY(1) -OpenBSD June 20, 2014 TH-NOBODY(1) +OpenBSD April 13, 2022 TH-NOBODY(1) -- To unsubscribe send an email to source+unsubscribe@mandoc.bsd.lv