[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  a8275fbc4a252ee3a4d404fa828f04ba267fe085 (commit)
      from  1e08f3ba9ec495fbd4a4cd6a411dc4e052626eda (commit)


- Log -----------------------------------------------------------------
commit a8275fbc4a252ee3a4d404fa828f04ba267fe085
Author: Tomas Mraz <tomas at openssl.org>
Date:   Fri Mar 12 16:35:28 2021 +0100

    decoder_process: data_structure can be NULL
    
    Check it before dereferencing.
    
    Fixes #14530
    
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/14531)

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

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

diff --git a/crypto/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c
index e928561b81..a644924aeb 100644
--- a/crypto/encode_decode/decoder_lib.c
+++ b/crypto/encode_decode/decoder_lib.c
@@ -608,7 +608,7 @@ static int decoder_process(const OSSL_PARAM params[], void *arg)
          * too special knowledge.
          */
         trace_data_structure = data_structure;
-        if (data_type != NULL
+        if (data_type != NULL && data_structure != NULL
             && strcasecmp(data_structure, "type-specific") == 0)
             data_structure = NULL;