From: Pauli <ppzgs1@gmail.com>
Date: Wed, 17 Mar 2021 02:55:37 +0000 (+1000)
Subject: evp: fix coverity 1445872 - dereference after null check
X-Git-Tag: openssl-3.0.0-alpha14~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=28c21fa048db0f1850e533c82a13d01c98de7ea1;p=thirdparty%2Fopenssl.git

evp: fix coverity 1445872 - dereference after null check

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14589)
---

diff --git a/crypto/evp/digest.c b/crypto/evp/digest.c
index d256cbe140d..494e0f5646d 100644
--- a/crypto/evp/digest.c
+++ b/crypto/evp/digest.c
@@ -457,7 +457,12 @@ int EVP_DigestFinalXOF(EVP_MD_CTX *ctx, unsigned char *md, size_t size)
     OSSL_PARAM params[2];
     size_t i = 0;
 
-    if (ctx->digest == NULL || ctx->digest->prov == NULL)
+    if (ctx->digest == NULL) {
+        ERR_raise(ERR_LIB_EVP, EVP_R_INVALID_NULL_ALGORITHM);
+        return 0;
+    }
+
+    if (ctx->digest->prov == NULL)
         goto legacy;
 
     if (ctx->digest->dfinal == NULL) {