From 94f4d58a87eac9c6fe4cb46b998656bd6d6f03a5 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Mon, 1 Jul 2019 09:41:47 +0200 Subject: [PATCH] Check for V_ASN1_BOOLEAN/V_ASN1_NULL in X509_ATTRIBUTE_get0_data The member value.ptr is undefined for those ASN1 types. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/9278) --- crypto/x509/x509_att.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crypto/x509/x509_att.c b/crypto/x509/x509_att.c index f1cd9df23e..317a45a4fa 100644 --- a/crypto/x509/x509_att.c +++ b/crypto/x509/x509_att.c @@ -314,7 +314,9 @@ void *X509_ATTRIBUTE_get0_data(X509_ATTRIBUTE *attr, int idx, ttmp = X509_ATTRIBUTE_get0_type(attr, idx); if (!ttmp) return NULL; - if (atrtype != ASN1_TYPE_get(ttmp)) { + if (atrtype == V_ASN1_BOOLEAN + || atrtype == V_ASN1_NULL + || atrtype != ASN1_TYPE_get(ttmp)) { X509err(X509_F_X509_ATTRIBUTE_GET0_DATA, X509_R_WRONG_TYPE); return NULL; } -- 2.34.1