From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 12 Mar 2021 15:35:28 +0000 (+0100)
Subject: decoder_process: data_structure can be NULL
X-Git-Tag: openssl-3.0.0-alpha14~274
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8275fbc4a252ee3a4d404fa828f04ba267fe085;p=thirdparty%2Fopenssl.git

decoder_process: data_structure can be NULL

Check it before dereferencing.

Fixes #14530

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14531)
---

diff --git a/crypto/encode_decode/decoder_lib.c b/crypto/encode_decode/decoder_lib.c
index e928561b81b..a644924aebc 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;