From 9460c128e40f65cfb15e776c2d51ea26f06b4ef7 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Wed, 13 Apr 2022 13:19:34 +0000
Subject: Surprisingly, groff supports multiple copy mode escapes at the
 beginning of an escape sequence: \, \E, \EE, \EEE, and so on all do the same
 outside copy mode, so let them do the same in mandoc(1), too.

This fixes an assertion failure triggered by \EE*X that tb@ found
with afl(1).  The first E was consumed by roff_expand(), but that
function failed to recognize the escape sequence as the expansion
of a user-defined string and handed it over to mandoc_escape(),
which consumed the second E and then died on an assertion because
it is not prepared to handle user-defined strings.  Fix this by
letting *both* functions handle arbitrary numbers of 'E's correctly.
---
 regress/roff/esc/E1.in        | 27 +++++++++++++++++++++++++++
 regress/roff/esc/E1.out_ascii | 21 +++++++++++++++++++++
 regress/roff/esc/Makefile     |  4 ++--
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 regress/roff/esc/E1.in
 create mode 100644 regress/roff/esc/E1.out_ascii

(limited to 'regress/roff')

diff --git a/regress/roff/esc/E1.in b/regress/roff/esc/E1.in
new file mode 100644
index 00000000..1bd1b871
--- /dev/null
+++ b/regress/roff/esc/E1.in
@@ -0,0 +1,27 @@
+.\" $OpenBSD: E1.in,v 1.1 2022/04/13 13:11:33 schwarze Exp $
+.Dd $Mdocdate$
+.Dt ESC-E 1
+.Os
+.Sh NAME
+.Nm esc-E
+.Nd copy-mode escaping of backslashes
+.Sh DESCRIPTION
+.ds myvar myval
+.nr myreg 1 1
+initial text
+.Pp
+string expansion: \*[myvar] \E*[myvar] \EE*[myvar] \EEE*[myvar]
+.Pp
+output device: \*(.T \E*[.T] \EE*(.T \EEE*(.T
+.Pp
+numerical expression test: \B'1' \EB'X' \EEB'2' \EEEB'Y'
+.Pp
+register:
+\n[myreg]
+\En+[myreg]
+\EEn+[myreg]
+\EEEn[myreg]
+.Pp
+special character: \(<= \E(>= \EE(<< \EEE(>>
+.Pp
+final text
diff --git a/regress/roff/esc/E1.out_ascii b/regress/roff/esc/E1.out_ascii
new file mode 100644
index 00000000..1c4dbe14
--- /dev/null
+++ b/regress/roff/esc/E1.out_ascii
@@ -0,0 +1,21 @@
+ESC-E(1)                    General Commands Manual                   ESC-E(1)
+
+NNAAMMEE
+     eesscc--EE - copy-mode escaping of backslashes
+
+DDEESSCCRRIIPPTTIIOONN
+     initial text
+
+     string expansion: myval myval myval myval
+
+     output device: ascii ascii ascii ascii
+
+     numerical expression test: 1 0 1 0
+
+     register: 1 2 3 3
+
+     special character: <= >= << >>
+
+     final text
+
+OpenBSD                         April 13, 2022                         OpenBSD
diff --git a/regress/roff/esc/Makefile b/regress/roff/esc/Makefile
index 8c4fdaba..4c152fc4 100644
--- a/regress/roff/esc/Makefile
+++ b/regress/roff/esc/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.17 2020/12/21 14:55:58 schwarze Exp $
+# $OpenBSD: Makefile,v 1.18 2022/04/13 13:11:33 schwarze Exp $
 
-REGRESS_TARGETS	 = one two multi B bs_man bs_mdoc c c_man e f h l O1 o p w z
+REGRESS_TARGETS	 = one two multi B bs_man bs_mdoc c c_man E1 e f h l O1 o p w z
 REGRESS_TARGETS	+= ignore invalid unsupp
 HTML_TARGETS	 = f
 LINT_TARGETS	 = B h l O1 w ignore invalid unsupp
-- 
cgit