From 9bada854de16bcc1a9dc199b4b352b19ab6897fc Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 20 Nov 2019 13:07:04 +1000 Subject: [PATCH] Engine: Add NULL check. Add NULL check for return from pkey_asn1_meths. Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/10473) --- crypto/engine/tb_asnmth.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c index 5e356312a0..6289c225a5 100644 --- a/crypto/engine/tb_asnmth.c +++ b/crypto/engine/tb_asnmth.c @@ -147,7 +147,8 @@ const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e, nidcount = e->pkey_asn1_meths(e, NULL, &nids, 0); for (i = 0; i < nidcount; i++) { e->pkey_asn1_meths(e, &ameth, NULL, nids[i]); - if (((int)strlen(ameth->pem_str) == len) + if (ameth != NULL + && ((int)strlen(ameth->pem_str) == len) && strncasecmp(ameth->pem_str, str, len) == 0) return ameth; } -- 2.34.1