summaryrefslogtreecommitdiffstats
path: root/crypto/asn1/tasn_dec.c
diff options
context:
space:
mode:
authorMark J. Cox <mark@openssl.org>2006-09-28 13:20:44 +0000
committerMark J. Cox <mark@openssl.org>2006-09-28 13:20:44 +0000
commit348be7ec60f7cce7503ba759a1a5a7591a648f1f (patch)
treef2ddd89c31aed4fdbaaa65ec959b2bd2db854c58 /crypto/asn1/tasn_dec.c
parent3ff55e9680cc99f330f25e48cd1422e3459c02de (diff)
Fix ASN.1 parsing of certain invalid structures that can result
in a denial of service. (CVE-2006-2937) [Steve Henson]
Diffstat (limited to 'crypto/asn1/tasn_dec.c')
-rw-r--r--crypto/asn1/tasn_dec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index fe1bfd0a90..c32510ffda 100644
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -832,6 +832,7 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval,
}
else if (ret == -1)
return -1;
+ ret = 0;
/* SEQUENCE, SET and "OTHER" are left in encoded form */
if ((utype == V_ASN1_SEQUENCE)
|| (utype == V_ASN1_SET) || (utype == V_ASN1_OTHER))