From: Shane Lontis <shane.lontis@oracle.com>
Date: Tue, 11 Aug 2020 05:56:17 +0000 (+1000)
Subject: Fix coverity CID #1465525 - NULL pointer dereference in OSSL_DECODER_CTX_new_by_EVP_P... 
X-Git-Tag: openssl-3.0.0-alpha7~505
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75348bb29820a10c0afbe754fdd03ceacc91979e;p=thirdparty%2Fopenssl.git

Fix coverity CID #1465525 - NULL pointer dereference in OSSL_DECODER_CTX_new_by_EVP_PKEY()

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12628)
---

diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c
index e04b94de863..7ab38f228fc 100644
--- a/crypto/encode_decode/decoder_pkey.c
+++ b/crypto/encode_decode/decoder_pkey.c
@@ -369,8 +369,10 @@ OSSL_DECODER_CTX *OSSL_DECODER_CTX_new_by_EVP_PKEY(EVP_PKEY **pkey,
 
     data->process_data = NULL;
  err:
-    decoder_clean_EVP_PKEY_construct_arg(data->process_data);
-    sk_OPENSSL_CSTRING_free(data->names);
-    OPENSSL_free(data);
+    if (data != NULL) {
+        decoder_clean_EVP_PKEY_construct_arg(data->process_data);
+        sk_OPENSSL_CSTRING_free(data->names);
+        OPENSSL_free(data);
+    }
     return ctx;
 }