diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-08-11 15:56:17 +1000 |
|---|---|---|
| committer | Shane Lontis <shane.lontis@oracle.com> | 2020-08-24 11:19:28 +1000 |
| commit | 75348bb29820a10c0afbe754fdd03ceacc91979e (patch) | |
| tree | 12f3d96b8961101926e3d1e025c763646feb07c1 /crypto/encode_decode/decoder_pkey.c | |
| parent | e499a64befa50bc2e7b9cb3173e8ac9b402fe1f9 (diff) | |
| download | openssl-new-75348bb29820a10c0afbe754fdd03ceacc91979e.tar.gz | |
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)
Diffstat (limited to 'crypto/encode_decode/decoder_pkey.c')
| -rw-r--r-- | crypto/encode_decode/decoder_pkey.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/encode_decode/decoder_pkey.c b/crypto/encode_decode/decoder_pkey.c index e04b94de86..7ab38f228f 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; } |