From 7c40819202a237992fca6908264b2b5034db5bd7 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Thu, 17 Apr 2025 17:00:39 -0700
Subject: [PATCH] free CRASHREPORT option data

Plug a straightforward memory leak.
---
 src/options.c | 17 +++++++++--------
 src/sys.c     |  7 +++++++
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/options.c b/src/options.c
index 468f8be00..22963b343 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1238,11 +1238,11 @@ optfn_crash_email(
         return optn_ok;
     }
     if (req == do_set) {
-        if ((op = string_for_opt(opts, FALSE))
-            != empty_optstr) {
-            gc.crash_email = dupstr(op);
-        } else
+        if ((op = string_for_opt(opts, FALSE)) == empty_optstr)
             return optn_err;
+        if (gc.crash_email)
+            free((genericptr_t) gc.crash_email);
+        gc.crash_email = dupstr(op);
         return optn_ok;
     }
     if (req == get_val || req == get_cnf_val) {
@@ -1264,11 +1264,11 @@ optfn_crash_name(
         return optn_ok;
     }
     if (req == do_set) {
-        if ((op = string_for_opt(opts, FALSE))
-            != empty_optstr) {
-            gc.crash_name = dupstr(op);
-        } else
+        if ((op = string_for_opt(opts, FALSE)) == empty_optstr)
             return optn_err;
+        if (gc.crash_name)
+            free((genericptr_t) gc.crash_name);
+        gc.crash_name = dupstr(op);
         return optn_ok;
     }
     if (req == get_val || req == get_cnf_val) {
@@ -1311,6 +1311,7 @@ optfn_crash_urlmax(
     }
     return optn_ok;
 }
+
 #endif /* CRASHREPORT */
 
 #ifdef CURSES_GRAPHICS
diff --git a/src/sys.c b/src/sys.c
index 41710bfbb..9cdead0ba 100644
--- a/src/sys.c
+++ b/src/sys.c
@@ -143,6 +143,13 @@ sysopt_release(void)
     if (sysopt.greppath)
         free((genericptr_t) sysopt.greppath), sysopt.greppath = (char *) 0;
 
+#ifdef CRASHREPORT
+    if (gc.crash_email)
+        free((genericptr_t) gc.crash_email), gc.crash_email = (char *) NULL;
+    if (gc.crash_name)
+        free((genericptr_t) gc.crash_name), gc.crash_name = (char *) NULL;
+#endif
+
     /* this one's last because it might be used in panic feedback, although
        none of the preceding ones are likely to trigger a controlled panic */
     if (sysopt.fmtd_wizard_list)