]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Coverity #1486687: fix potential dereference of NULL keymgmt
authorTomas Mraz <tomas@openssl.org>
Fri, 2 Jul 2021 13:45:09 +0000 (15:45 +0200)
committerPauli <pauli@openssl.org>
Mon, 5 Jul 2021 02:44:54 +0000 (12:44 +1000)
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15986)

crypto/encode_decode/decoder_pkey.c

index 719bd17b2ff67321733ff30aac3153d6347f758e..edbea4face46a13426fe7a655d6e5cd5284411c4 100644 (file)
@@ -126,9 +126,9 @@ static int decoder_construct_pkey(OSSL_DECODER_INSTANCE *decoder_inst,
         /* To allow it to be freed further down */
         if (!EVP_KEYMGMT_up_ref(keymgmt))
             return 0;
-    } else {
-        keymgmt = EVP_KEYMGMT_fetch(data->libctx,
-                                    data->object_type, data->propq);
+    } else if ((keymgmt = EVP_KEYMGMT_fetch(data->libctx,
+                                            data->object_type,
+                                            data->propq)) != NULL) {
         keymgmt_prov = EVP_KEYMGMT_get0_provider(keymgmt);
     }