From: Richard Levitte <levitte@openssl.org>
Date: Tue, 14 Jun 2016 21:54:56 +0000 (+0200)
Subject: Always check that the value returned by asn1_do_adb() is non-NULL
X-Git-Tag: OpenSSL_1_1_0-pre6~436
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=bace847eae24f48adc6a967c6cce7f8d05bbeda3

Always check that the value returned by asn1_do_adb() is non-NULL

Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Emilia Käsper <emilia@openssl.org>
---

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index aad838a083..64518ee24e 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -301,6 +301,8 @@ static int asn1_item_embed_d2i(ASN1_VALUE **pval, const unsigned char **in,
                 const ASN1_TEMPLATE *seqtt;
                 ASN1_VALUE **pseqval;
                 seqtt = asn1_do_adb(pval, tt, 1);
+                if (!seqtt)
+                    continue;
                 pseqval = asn1_get_field_ptr(pval, seqtt);
                 asn1_template_free(pseqval, seqtt);
             }