From 7fbd65bb7b0a99c63cb70db3c228f22a76ec5066 Mon Sep 17 00:00:00 2001 From: schwarze Date: Tue, 26 Apr 2022 11:28:35 +0000 Subject: [PATCH] If a node is tagged explicitly, skip implicit tagging for that node. Apart from making sense in the first place, this fixes an assertion failure that happened when the calculated implicit tag did not match the string value of the first child of the node, Bug found by tb@ using afl(1). --- regress/usr.bin/mandoc/mdoc/Tg/Makefile | 8 +++---- regress/usr.bin/mandoc/mdoc/Tg/implicit.in | 14 +++++++++++++ .../usr.bin/mandoc/mdoc/Tg/implicit.out_ascii | 13 ++++++++++++ .../usr.bin/mandoc/mdoc/Tg/implicit.out_html | 2 ++ .../mandoc/mdoc/Tg/implicit.out_markdown | 15 +++++++++++++ .../usr.bin/mandoc/mdoc/Tg/implicit.out_tag | 3 +++ usr.bin/mandoc/tag.c | 21 +++++++++++++++---- 7 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 regress/usr.bin/mandoc/mdoc/Tg/implicit.in create mode 100644 regress/usr.bin/mandoc/mdoc/Tg/implicit.out_ascii create mode 100644 regress/usr.bin/mandoc/mdoc/Tg/implicit.out_html create mode 100644 regress/usr.bin/mandoc/mdoc/Tg/implicit.out_markdown create mode 100644 regress/usr.bin/mandoc/mdoc/Tg/implicit.out_tag diff --git a/regress/usr.bin/mandoc/mdoc/Tg/Makefile b/regress/usr.bin/mandoc/mdoc/Tg/Makefile index d67ec5affa8..83ae4160f6c 100644 --- a/regress/usr.bin/mandoc/mdoc/Tg/Makefile +++ b/regress/usr.bin/mandoc/mdoc/Tg/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2020/04/06 09:55:50 schwarze Exp $ +# $OpenBSD: Makefile,v 1.3 2022/04/26 11:28:35 schwarze Exp $ -REGRESS_TARGETS = column list warn -TAG_TARGETS = column list warn +REGRESS_TARGETS = column implicit list warn +TAG_TARGETS = column implicit list warn LINT_TARGETS = warn -HTML_TARGETS = column list warn +HTML_TARGETS = column implicit list warn SKIP_TMAN = column diff --git a/regress/usr.bin/mandoc/mdoc/Tg/implicit.in b/regress/usr.bin/mandoc/mdoc/Tg/implicit.in new file mode 100644 index 00000000000..9abd23c9231 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Tg/implicit.in @@ -0,0 +1,14 @@ +.\" $OpenBSD: implicit.in,v 1.1 2022/04/26 11:28:35 schwarze Exp $ +.Dd $Mdocdate: April 26 2022 $ +.Dt TG-IMPLICIT 1 +.Os +.Sh NAME +.Nm Tg-implicit +.Nd overriding implicit tagging +.Sh DESCRIPTION +BEGINTEST +.Pp +.Tg explicit +.Sy implicit is unsused +.Pp +ENDTEST diff --git a/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_ascii b/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_ascii new file mode 100644 index 00000000000..e3618686b86 --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_ascii @@ -0,0 +1,13 @@ +TG-IMPLICIT(1) General Commands Manual TG-IMPLICIT(1) + +NNAAMMEE + TTgg--iimmpplliicciitt - overriding implicit tagging + +DDEESSCCRRIIPPTTIIOONN + BEGINTEST + + iimmpplliicciitt iiss uunnssuusseedd + + ENDTEST + +OpenBSD April 26, 2022 OpenBSD diff --git a/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_html b/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_html new file mode 100644 index 00000000000..93df918de1b --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_html @@ -0,0 +1,2 @@ +

diff --git a/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_markdown b/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_markdown new file mode 100644 index 00000000000..6511e44173e --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_markdown @@ -0,0 +1,15 @@ +TG-IMPLICIT(1) - General Commands Manual + +# NAME + +**Tg-implicit** - overriding implicit tagging + +# DESCRIPTION + +BEGINTEST + +**implicit is unsused** + +ENDTEST + +OpenBSD - April 26, 2022 diff --git a/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_tag b/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_tag new file mode 100644 index 00000000000..b7b9a92768e --- /dev/null +++ b/regress/usr.bin/mandoc/mdoc/Tg/implicit.out_tag @@ -0,0 +1,3 @@ +NAME implicit.mandoc_ascii 3 +DESCRIPTION implicit.mandoc_ascii 6 +explicit implicit.mandoc_ascii 9 diff --git a/usr.bin/mandoc/tag.c b/usr.bin/mandoc/tag.c index 6db87ccacc1..8cb7bdb393c 100644 --- a/usr.bin/mandoc/tag.c +++ b/usr.bin/mandoc/tag.c @@ -1,6 +1,7 @@ -/* $OpenBSD: tag.c,v 1.36 2020/04/19 16:26:11 schwarze Exp $ */ +/* $OpenBSD: tag.c,v 1.37 2022/04/26 11:28:35 schwarze Exp $ */ /* - * Copyright (c) 2015,2016,2018,2019,2020 Ingo Schwarze + * Copyright (c) 2015, 2016, 2018, 2019, 2020, 2022 + * Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -78,7 +79,7 @@ tag_free(void) /* * Set a node where a term is defined, - * unless it is already defined at a lower priority. + * unless the term is already defined at a lower priority. */ void tag_put(const char *s, int prio, struct roff_node *n) @@ -91,6 +92,18 @@ tag_put(const char *s, int prio, struct roff_node *n) assert(prio <= TAG_FALLBACK); + /* + * If the node is already tagged, the existing tag is + * explicit and we are now about to add an implicit tag. + * Don't do that; just skip implicit tagging if the author + * specified an explicit tag. + */ + + if (n->flags & NODE_ID) + return; + + /* Determine the implicit tag. */ + if (s == NULL) { if (n->child == NULL || n->child->type != ROFFT_TEXT) return; @@ -148,7 +161,7 @@ tag_put(const char *s, int prio, struct roff_node *n) */ else if (entry->prio < prio) - return; + return; /* * If the existing entry is worse, clear it. -- 2.20.1