diff options
| author | Simon L. B. Nielsen <simon@FreeBSD.org> | 2006-10-01 07:38:44 +0000 |
|---|---|---|
| committer | Simon L. B. Nielsen <simon@FreeBSD.org> | 2006-10-01 07:38:44 +0000 |
| commit | ed5d4f9a94bdae2f8fb5fe3f2608eef20d2499ca (patch) | |
| tree | ddbe8498869205da709070fe1d40135d495b9326 /crypto/openssl/crypto/asn1/tasn_dec.c | |
| parent | 3b4e3dcb9f42dc9f4f864acf804677d7a3e0c233 (diff) | |
| download | src-ed5d4f9a94bdae2f8fb5fe3f2608eef20d2499ca.tar.gz src-ed5d4f9a94bdae2f8fb5fe3f2608eef20d2499ca.zip | |
Vendor import of OpenSSL 0.9.8d.
Notes
Notes:
svn path=/vendor-crypto/openssl/dist/; revision=162911
Diffstat (limited to 'crypto/openssl/crypto/asn1/tasn_dec.c')
| -rw-r--r-- | crypto/openssl/crypto/asn1/tasn_dec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/openssl/crypto/asn1/tasn_dec.c b/crypto/openssl/crypto/asn1/tasn_dec.c index f8b27cffdbf4..ff2f77b9d8c1 100644 --- a/crypto/openssl/crypto/asn1/tasn_dec.c +++ b/crypto/openssl/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)) @@ -878,7 +879,10 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, * for UNIVERSAL class and ignore the tag. */ if (!asn1_collect(&buf, &p, plen, inf, -1, V_ASN1_UNIVERSAL)) + { + free_cont = 1; goto err; + } len = buf.length; /* Append a final null to string */ if (!BUF_MEM_grow_clean(&buf, len + 1)) |