From 101088c39000ffa60f3c6b016fd3c66423273725 Mon Sep 17 00:00:00 2001
From: Andras Fekete <andras@wolfssl.com>
Date: Tue, 6 Aug 2024 12:35:01 -0400
Subject: [PATCH] Fix potential NULL dereference

---
 src/ocsp.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/ocsp.c b/src/ocsp.c
index c7f452b87..89a6f6ffb 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -824,13 +824,16 @@ out:
     if (ret != 0) {
         if (derCert != NULL)
             FreeDer(&derCert);
-        XFREE(certId, cm->heap, DYNAMIC_TYPE_OPENSSL);
-        certId = NULL;
-        XFREE(certStatus, cm->heap, DYNAMIC_TYPE_OPENSSL);
+        if (cm != NULL) {
+            XFREE(certId, cm->heap, DYNAMIC_TYPE_OPENSSL);
+            certId = NULL;
+            XFREE(certStatus, cm->heap, DYNAMIC_TYPE_OPENSSL);
+        }
     }
 
 #ifdef WOLFSSL_SMALL_STACK
-    XFREE(cert, cm->heap, DYNAMIC_TYPE_DCERT);
+    if (cm != NULL)
+        XFREE(cert, cm->heap, DYNAMIC_TYPE_DCERT);
 #endif
 
     if (cm != NULL)