From 7cabaa71be06a4eb5ac54da1020bfbb65c2092df Mon Sep 17 00:00:00 2001
From: Bartel Artem <artem.bartel@gmail.com>
Date: Tue, 10 Jun 2025 13:11:41 +0300
Subject: [PATCH] check gctx for NULL before cleanup.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27795)

(cherry picked from commit 02f9c9342d54c99981b0a83088982bf0d1083d7f)
---
 providers/implementations/keymgmt/ecx_kmgmt.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/providers/implementations/keymgmt/ecx_kmgmt.c b/providers/implementations/keymgmt/ecx_kmgmt.c
index 6ea0001e578..941dbfa35d8 100644
--- a/providers/implementations/keymgmt/ecx_kmgmt.c
+++ b/providers/implementations/keymgmt/ecx_kmgmt.c
@@ -510,8 +510,10 @@ static void *ecx_gen_init(void *provctx, int selection,
 #endif
     }
     if (!ecx_gen_set_params(gctx, params)) {
-        ecx_gen_cleanup(gctx);
-        gctx = NULL;
+        if (gctx != NULL) {
+            ecx_gen_cleanup(gctx);
+            gctx = NULL;
+        }
     }
     return gctx;
 }
-- 
2.47.2