From 1d022c0232225be96f7d80e4187118c7beb97545 Mon Sep 17 00:00:00 2001
From: tb <tb@openbsd.org>
Date: Wed, 20 Mar 2024 21:31:31 +0000
Subject: [PATCH] Implement imodule_free() and call it from module_finish()

ok jsing
---
 lib/libcrypto/conf/conf_mod.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/libcrypto/conf/conf_mod.c b/lib/libcrypto/conf/conf_mod.c
index f1a88c92b3d..f1522b95189 100644
--- a/lib/libcrypto/conf/conf_mod.c
+++ b/lib/libcrypto/conf/conf_mod.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_mod.c,v 1.29 2024/03/20 21:21:03 tb Exp $ */
+/* $OpenBSD: conf_mod.c,v 1.30 2024/03/20 21:31:31 tb Exp $ */
 /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -97,6 +97,7 @@ static STACK_OF(CONF_MODULE) *supported_modules = NULL;
 static STACK_OF(CONF_IMODULE) *initialized_modules = NULL;
 
 static void module_free(CONF_MODULE *md);
+static void imodule_free(CONF_IMODULE *imod);
 static void module_finish(CONF_IMODULE *imod);
 static int module_run(const CONF *cnf, char *name, char *value,
     unsigned long flags);
@@ -371,6 +372,17 @@ module_free(CONF_MODULE *md)
 	free(md);
 }
 
+static void
+imodule_free(CONF_IMODULE *imod)
+{
+	if (imod == NULL)
+		return;
+
+	free(imod->name);
+	free(imod->value);
+	free(imod);
+}
+
 /* finish and free up all modules instances */
 
 void
@@ -394,9 +406,8 @@ module_finish(CONF_IMODULE *imod)
 	if (imod->pmod->finish)
 		imod->pmod->finish(imod);
 	imod->pmod->links--;
-	free(imod->name);
-	free(imod->value);
-	free(imod);
+
+	imodule_free(imod);
 }
 
 /* Add a static module to OpenSSL */
-- 
2.20.1