From fe93901866282c22247e22b4e89c8d1c051995ba Mon Sep 17 00:00:00 2001
From: Anthony Hu <anthony@wolfssl.com>
Date: Mon, 17 Nov 2025 10:51:39 -0500
Subject: [PATCH] Check keystring present. This prevents segfault.

---
 src/x509/clu_request_setup.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/x509/clu_request_setup.c b/src/x509/clu_request_setup.c
index 0989e24..1de6878 100644
--- a/src/x509/clu_request_setup.c
+++ b/src/x509/clu_request_setup.c
@@ -598,11 +598,18 @@ int wolfCLU_requestSetup(int argc, char** argv)
                 break;
 
             case WOLFCLU_NEWKEY:
-                if (XSTRSTR(optarg, ":") == NULL) {
-                    wolfCLU_LogError("key string does not have ':'");
+                if (optarg == NULL) {
+                    wolfCLU_LogError("no key string");
                     ret = WOLFCLU_FATAL_ERROR;
                 }
 
+                if (ret == WOLFCLU_SUCCESS) {
+                    if (XSTRSTR(optarg, ":") == NULL) {
+                        wolfCLU_LogError("key string does not have ':'");
+                        ret = WOLFCLU_FATAL_ERROR;
+                    }
+                }
+
                 if (ret == WOLFCLU_SUCCESS) {
                     int idx;