[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  42e97dde808e6471575696fdec41e2f8d2ef9feb (commit)
      from  f77208693ec3bda99618e6f76c0f8d279c0077bb (commit)


- Log -----------------------------------------------------------------
commit 42e97dde808e6471575696fdec41e2f8d2ef9feb
Author: Shane Lontis <shane.lontis at oracle.com>
Date:   Mon Jun 14 16:43:28 2021 +1000

    Add missing NULL check in OSSL_DECODER_from_bio().
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15733)

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

Summary of changes:
 crypto/encode_decode/decoder_lib.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/crypto/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c
index 4053eac62e..c637b5bfef 100644
--- a/crypto/encode_decode/decoder_lib.c
+++ b/crypto/encode_decode/decoder_lib.c
@@ -48,6 +48,11 @@ int OSSL_DECODER_from_bio(OSSL_DECODER_CTX *ctx, BIO *in)
     int ok = 0;
     BIO *new_bio = NULL;
 
+    if (in == NULL) {
+        ERR_raise(ERR_LIB_OSSL_DECODER, ERR_R_PASSED_NULL_PARAMETER);
+        return 0;
+    }
+
     if (OSSL_DECODER_CTX_get_num_decoders(ctx) == 0) {
         ERR_raise_data(ERR_LIB_OSSL_DECODER, OSSL_DECODER_R_DECODER_NOT_FOUND,
                        "No decoders were found. For standard decoders you need "