From: Richard Levitte Date: Tue, 14 Jun 2016 23:31:14 +0000 (+0200) Subject: Change (!seqtt) to (seqtt == NULL) X-Git-Tag: OpenSSL_1_0_2i~142 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5e102f96eb6fcdba1db2dba41132f92fa492aea0;p=oweals%2Fopenssl.git Change (!seqtt) to (seqtt == NULL) Reviewed-by: Stephen Henson Reviewed-by: Emilia Käsper (cherry picked from commit fdcb499cc2cd57412e496302a4bca8c5d9f1a9c7) --- diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c index cda19bb8d1..6b01f65357 100644 --- a/crypto/asn1/tasn_dec.c +++ b/crypto/asn1/tasn_dec.c @@ -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;