[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  f050745fe69a538952f3e12af3718d19ef2df2e2 (commit)
      from  68b78dd7e40f57064b0f24728d8b544fe583599c (commit)


- Log -----------------------------------------------------------------
commit f050745fe69a538952f3e12af3718d19ef2df2e2
Author: Kan <chenxinpingc2306 at 163.com>
Date:   Fri Dec 17 00:05:24 2021 +0800

    Fix the null pointer dereference
    
    Fixes #17296
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17297)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bn/bn_conv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/bn/bn_conv.c b/crypto/bn/bn_conv.c
index 4af546a25b..6757f3d0aa 100644
--- a/crypto/bn/bn_conv.c
+++ b/crypto/bn/bn_conv.c
@@ -142,7 +142,7 @@ int BN_hex2bn(BIGNUM **bn, const char *a)
         continue;
 
     if (i == 0 || i > INT_MAX / 4)
-        goto err;
+        return 0;
 
     num = i + neg;
     if (bn == NULL)