From 9022762e5a2feb69f73b85c3854d1d2a7b3d5833 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Fri, 9 Apr 2021 10:54:36 -0700 Subject: [PATCH] Check to see if a pointer is nonnull that is expected to be. --- wolfcrypt/src/dh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wolfcrypt/src/dh.c b/wolfcrypt/src/dh.c index 3fa95fa11..1b3fac98e 100644 --- a/wolfcrypt/src/dh.c +++ b/wolfcrypt/src/dh.c @@ -2621,7 +2621,8 @@ int wc_DhCmpNamedKey(int name, int noQ, } cmp = (pSz == pCmpSz) && (gSz == gCmpSz) && - (noQ || ((qSz == qCmpSz) && XMEMCMP(q, qCmp, qCmpSz))) && + (noQ || ((qCmp != NULL) && (qSz == qCmpSz) && + XMEMCMP(q, qCmp, qCmpSz) == 0)) && (XMEMCMP(p, pCmp, pCmpSz) == 0) && (XMEMCMP(g, gCmp, gCmpSz) == 0);