Commit 5e102f96 authored by Richard Levitte's avatar Richard Levitte
Browse files

Change (!seqtt) to (seqtt == NULL) 



Reviewed-by: default avatarStephen Henson <steve@openssl.org>
Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
(cherry picked from commit fdcb499c)
parent a9b23465

crypto/asn1/tasn_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, 
                const ASN1_TEMPLATE *seqtt;

                ASN1_VALUE **pseqval;

                seqtt = asn1_do_adb(pval, tt, 1);

                if (!seqtt)

                if (seqtt == NULL)

                    continue;

                pseqval = asn1_get_field_ptr(pval, seqtt);

                ASN1_template_free(pseqval, seqtt);
@@ -413,7 +413,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, 
            const ASN1_TEMPLATE *seqtt;

            ASN1_VALUE **pseqval;

            seqtt = asn1_do_adb(pval, tt, 1);

            if (!seqtt)

            if (seqtt == NULL)

                goto err;

            pseqval = asn1_get_field_ptr(pval, seqtt);

            /* Have we ran out of data? */
@@ -478,7 +478,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, const unsigned char **in, long len, 
        for (; i < it->tcount; tt++, i++) {

            const ASN1_TEMPLATE *seqtt;

            seqtt = asn1_do_adb(pval, tt, 1);

            if (!seqtt)

            if (seqtt == NULL)

                goto err;

            if (seqtt->flags & ASN1_TFLG_OPTIONAL) {

                ASN1_VALUE **pseqval;