From: Pauli <paul.dale@oracle.com>
Date: Sun, 26 Apr 2020 22:26:39 +0000 (+1000)
Subject: coverity 1462546 Dereference after null check
X-Git-Tag: openssl-3.0.0-alpha2~127
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=089c292825a3b64ed375223751bd84a6da8312c1

coverity 1462546 Dereference after null check

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

diff --git a/crypto/evp/m_sigver.c b/crypto/evp/m_sigver.c
index 829b861ed2..c77683a69d 100644
--- a/crypto/evp/m_sigver.c
+++ b/crypto/evp/m_sigver.c
@@ -347,11 +347,13 @@ int EVP_DigestVerifyUpdate(EVP_MD_CTX *ctx, const void *data, size_t dsize)
                                                         data, dsize);
 
  legacy:
-    /* do_sigver_init() checked that |digest_custom| is non-NULL */
-    if (pctx->flag_call_digest_custom
-        && !ctx->pctx->pmeth->digest_custom(ctx->pctx, ctx))
-        return 0;
-    pctx->flag_call_digest_custom = 0;
+    if (pctx != NULL) {
+        /* do_sigver_init() checked that |digest_custom| is non-NULL */
+        if (pctx->flag_call_digest_custom
+            && !ctx->pctx->pmeth->digest_custom(ctx->pctx, ctx))
+            return 0;
+        pctx->flag_call_digest_custom = 0;
+    }
 
     return EVP_DigestUpdate(ctx, data, dsize);
 }