gbranden pushed a commit to branch master
in repository groff.
commit 971b12760c67549b5b332b064bfababcf592954e
Author: G. Branden Robinson <[email protected]>
AuthorDate: Thu Oct 1 16:06:49 2026 -0500
[mm]: Fix Savannah #68727.
* contrib/mm/m.tmac (qrf*validate-identifier): Fix botched test of
internal state for consistency. Abort due to internal error if
the `qrf*file` string is undefined (or empty), not if `qrf*caller` is.
Fixes <https://savannah.gnu.org/bugs/?68727>. Thanks to Hans Bezemer
for the report and a reproducer, and to Ingo Schwarze for a code review.
ANNOUNCE: Acknowledge Hans.
---
ANNOUNCE | 1 +
contrib/mm/ChangeLog | 13 +++++++++++++
contrib/mm/m.tmac | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/ANNOUNCE b/ANNOUNCE
index a521cecda..634f123fd 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -230,6 +230,7 @@ Deri James
Dmytro Bagrii
Doug McIlroy
Elias Hasas
+Hans Bezemer
Hilmar Preuße
Hubert Garavel
Ingo Schwarze
diff --git a/contrib/mm/ChangeLog b/contrib/mm/ChangeLog
index f45a68ec8..b687f7248 100644
--- a/contrib/mm/ChangeLog
+++ b/contrib/mm/ChangeLog
@@ -1,3 +1,16 @@
+2026-10-01 G. Branden Robinson <[email protected]>
+
+ Fix Savannah #68727.
+
+ * contrib/mm/m.tmac (qrf*validate-identifier): Fix botched test
+ of internal state for consistency. Abort due to internal error
+ if the `qrf*file` string is undefined (or empty), not if
+ `qrf*caller` is.
+
+ Fixes <https://savannah.gnu.org/bugs/?68727>. Thanks to Hans
+ Bezemer for the report and a reproducer, and to Ingo Schwarze
+ for a code review.
+
2026-10-01 G. Branden Robinson <[email protected]>
Regression-test Savannah #68727.
diff --git a/contrib/mm/m.tmac b/contrib/mm/m.tmac
index c6fd78364..55488954b 100644
--- a/contrib/mm/m.tmac
+++ b/contrib/mm/m.tmac
@@ -3750,7 +3750,7 @@ argument: '\\$2'
.\" qrf*validate-identifier candidate
.de qrf*validate-identifier
.if !\\n[.$]=1 .@abort expected an argument, got \\n[.$]
-.if '\\*[qrf*caller]'' .@abort qrf*caller string not initialized
+.if '\\*[qrf*file]'' .@abort qrf*file string not initialized
.if !\A'\\$1' \{
. ds qref*msg \\*[qrf*caller]: '\\$1' is not a valid string\"
. as qref*msg " identifier\"
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
