The branch master has been updated
via ab547fc005307ecf48451638e947cdabca147159 (commit)
from 884400d78992d1da1573a3677876b06421b797eb (commit)
- Log -----------------------------------------------------------------
commit ab547fc005307ecf48451638e947cdabca147159
Author: Pauli <[email protected]>
Date: Thu Nov 4 08:23:32 2021 +1000
avoid a NULL dereference when getting digest
Fixes #16961
Reviewed-by: Matthias St. Pierre <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/16969)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/evp_lib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index 64d7fb046d..24092cfd5b 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -999,7 +999,7 @@ EVP_MD *EVP_MD_CTX_get1_md(EVP_MD_CTX *ctx)
if (ctx == NULL)
return NULL;
md = (EVP_MD *)ctx->reqdigest;
- if (!EVP_MD_up_ref(md))
+ if (md == NULL || !EVP_MD_up_ref(md))
return NULL;
return md;
}
