Fix from review

Author: embhorn

src/x509.c

@@ -11711,16 +11711,23 @@ WOLF_STACK_OF(WOLFSSL_X509_OBJECT)* wolfSSL_sk_X509_OBJECT_deep_copy(
             cert->isCA = req->isCa;
             cert->basicConstSet = req->basicConstSet;
     #ifdef WOLFSSL_CERT_EXT
-            if (req->subjKeyIdSz <= CTC_MAX_SKID_SIZE) {
-                if (req->subjKeyId) {
+            if (req->subjKeyIdSz > CTC_MAX_SKID_SIZE) {
+                WOLFSSL_MSG("Subject Key ID too large");
+                WOLFSSL_ERROR_VERBOSE(BUFFER_E);
+                ret = WOLFSSL_FAILURE;
+            }
+            else if (req->subjKeyIdSz > 0) {
+                if (req->subjKeyId == NULL) {
+                    WOLFSSL_MSG("Subject Key ID missing");
+                    ret = WOLFSSL_FAILURE;
+                }
+                else {
                     XMEMCPY(cert->skid, req->subjKeyId, req->subjKeyIdSz);
+                    cert->skidSz = (int)req->subjKeyIdSz;
                 }
-                cert->skidSz = (int)req->subjKeyIdSz;
             }
             else {
-                WOLFSSL_MSG("Subject Key ID too large");
-                WOLFSSL_ERROR_VERBOSE(BUFFER_E);
-                ret = WOLFSSL_FAILURE;
+                cert->skidSz = 0;
             }
             if (ret == WOLFSSL_SUCCESS) {
                 if (req->keyUsageSet)