fix more null derefs

rlm2002 · rlm2002 · commit 8d8f77945431 · 2026-03-16T17:12:17.000-06:00
diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
@@ -12420,7 +12420,7 @@ int wc_DsaPublicKeyDecode(const byte* input, word32* inOutIdx, DsaKey* key,
         key->type = DSA_PUBLIC;
     }
 
-    FREE_ASNGETDATA(dataASN, key->heap);
+    FREE_ASNGETDATA(dataASN, key != NULL ? key->heap : NULL);
     return ret;
 #endif
 }
@@ -37187,7 +37187,7 @@ int wc_EccPrivateKeyDecode(const byte* input, word32* inOutIdx, ecc_key* key,
                 key, curve_id);
     }
 
-    FREE_ASNGETDATA(dataASN, key->heap);
+    FREE_ASNGETDATA(dataASN, key != NULL ? key->heap : NULL);
     return ret;
 #endif
 }
@@ -37625,7 +37625,7 @@ int wc_EccPublicKeyDecode(const byte* input, word32* inOutIdx,
         }
     }
 
-    FREE_ASNGETDATA(dataASN, key->heap);
+    FREE_ASNGETDATA(dataASN, key != NULL ? key->heap : NULL);
     return ret;
 #endif /* WOLFSSL_ASN_TEMPLATE */
 }

Original file line number	Diff line number	Diff line change
`@@ -12420,7 +12420,7 @@ int wc_DsaPublicKeyDecode(const byte* input, word32* inOutIdx, DsaKey* key,`
`12420`	`12420`	`key->type = DSA_PUBLIC;`
`12421`	`12421`	`}`
`12422`	`12422`
`12423`		`- FREE_ASNGETDATA(dataASN, key->heap);`
	`12423`	`+ FREE_ASNGETDATA(dataASN, key != NULL ? key->heap : NULL);`
`12424`	`12424`	`return ret;`
`12425`	`12425`	`#endif`
`12426`	`12426`	`}`
`@@ -37187,7 +37187,7 @@ int wc_EccPrivateKeyDecode(const byte* input, word32* inOutIdx, ecc_key* key,`
`37187`	`37187`	`key, curve_id);`
`37188`	`37188`	`}`
`37189`	`37189`
`37190`		`- FREE_ASNGETDATA(dataASN, key->heap);`
	`37190`	`+ FREE_ASNGETDATA(dataASN, key != NULL ? key->heap : NULL);`
`37191`	`37191`	`return ret;`
`37192`	`37192`	`#endif`
`37193`	`37193`	`}`
`@@ -37625,7 +37625,7 @@ int wc_EccPublicKeyDecode(const byte* input, word32* inOutIdx,`
`37625`	`37625`	`}`
`37626`	`37626`	`}`
`37627`	`37627`
`37628`		`- FREE_ASNGETDATA(dataASN, key->heap);`
	`37628`	`+ FREE_ASNGETDATA(dataASN, key != NULL ? key->heap : NULL);`
`37629`	`37629`	`return ret;`
`37630`	`37630`	`#endif /* WOLFSSL_ASN_TEMPLATE */`
`37631`	`37631`	`}`