From: Pauli <paul.dale@oracle.com>
Date: Wed, 20 Nov 2019 03:07:04 +0000 (+1000)
Subject: Engine: Add NULL check.
X-Git-Tag: OpenSSL_1_1_1e~135
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=333853fae6512ff71bf1b6da951ca0069c878c92;p=oweals%2Fopenssl.git

Engine: Add NULL check.

Add NULL check for return from pkey_asn1_meths.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10473)

(cherry picked from commit 9bada854de16bcc1a9dc199b4b352b19ab6897fc)
---

diff --git a/crypto/engine/tb_asnmth.c b/crypto/engine/tb_asnmth.c
index 130b289fec..72850b9398 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;
     }