From caa39f78ae906a3bfa039782414930bfc9ad8a0f Mon Sep 17 00:00:00 2001
From: Eric Blankenhorn <eric@wolfssl.com>
Date: Wed, 17 Feb 2021 13:53:30 -0600
Subject: [PATCH] Fix from review and leak in wolfSSL_X509_get_serialNumber

---
 src/ssl.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/ssl.c b/src/ssl.c
index f2c50075b..a2a5df75d 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -26431,6 +26431,14 @@ WOLFSSL_ASN1_INTEGER* wolfSSL_X509_get_serialNumber(WOLFSSL_X509* x509)
 
     WOLFSSL_ENTER("wolfSSL_X509_get_serialNumber");
 
+    if (x509 == NULL) {
+        WOLFSSL_MSG("NULL function argument");
+        return NULL;
+    }
+
+    if (x509->serialNumber != NULL)
+       return x509->serialNumber;
+
     a = wolfSSL_ASN1_INTEGER_new();
     if (a == NULL)
         return NULL;
@@ -45557,7 +45565,7 @@ int wolfSSL_X509_NAME_print_ex(WOLFSSL_BIO* bio, WOLFSSL_X509_NAME* name,
             return WOLFSSL_FAILURE;
     }
 
-    if (name->sz == 0)
+    if ((name == NULL) || (name->sz == 0))
         return WOLFSSL_FAILURE;
 
 #if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX)