gbranden pushed a commit to branch master
in repository groff.
commit 2542eb3f2ef12be6696e0e305937f82f87549df5
Author: G. Branden Robinson <[email protected]>
AuthorDate: Fri Dec 5 07:02:13 2025 -0600
[troff]: Add null pointer paranoia.
* src/roff/troff/input.cpp (define_class_request): Add assertion and, if
preprocessor `NDEBUG` symbol is defined, guard against null pointer
derefrence.
---
ChangeLog | 6 ++++++
src/roff/troff/input.cpp | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 45bfcfe16..89f8d527f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,12 @@
Fixes blunder I introduced in commit fcf3505a09, 10 November.
+2025-12-05 G. Branden Robinson <[email protected]>
+
+ * src/roff/troff/input.cpp (define_class_request): Add assertion
+ and, if preprocessor `NDEBUG` symbol is defined, guard against
+ null pointer derefrence.
+
2025-12-05 G. Branden Robinson <[email protected]>
* src/roff/troff/input.cpp (define_class_request): Add assertion
diff --git a/src/roff/troff/input.cpp b/src/roff/troff/input.cpp
index 4c998fcf1..95a42fe34 100644
--- a/src/roff/troff/input.cpp
+++ b/src/roff/troff/input.cpp
@@ -8771,7 +8771,8 @@ static void define_class_request()
}
child1 = 0 /* nullptr */;
}
- if (!ci->is_class()) {
+ assert(ci != 0 /* nullptr */);
+ if (ci != 0 /* nullptr */ && !ci->is_class()) {
warning(WARN_SYNTAX,
"empty class definition for '%1'",
nm.contents());
_______________________________________________
groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
