From 2d532dd6b8bfbb3a2332a58b92a3bf6845dea6b4 Mon Sep 17 00:00:00 2001
From: Anthony Hu <anthony@wolfssl.com>
Date: Mon, 1 Apr 2024 18:56:44 -0400
Subject: [PATCH] Clean up after another round of analyzer execution.

---
 tests/api.c         | 1 +
 wolfcrypt/src/asn.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/api.c b/tests/api.c
index a6942b391..04934df49 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -1074,6 +1074,7 @@ static int do_dual_alg_server_certgen(byte **out, char *caKeyFile,
     wc_FreeRsaKey(&caKey);
     wc_FreeRsaKey(&serverKey);
     wc_FreeRng(&rng);
+    wc_FreeDecodedCert(&preTBS);
     return outSz;
 }
 
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index fd2366c8c..048a79b85 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -27683,7 +27683,7 @@ static int EncodeName(EncodedName* name, const char* nameStr,
     }
 
 #ifdef WOLFSSL_CUSTOM_OID
-    if (type == ASN_CUSTOM_NAME) {
+    if (ret == 0) && (type == ASN_CUSTOM_NAME) {
         if (cname == NULL || cname->custom.oidSz == 0) {
             name->used = 0;
             return 0;