Update from HEAD.

diff --git a/crypto/asn1/tasn_dec.c b/crypto/asn1/tasn_dec.c
index c22501fc63b55757856a6060557c094efff85762..e5d5e4bfd15dc78868e0bd140bdd1b42d405d1f9 100644 (file)
--- a/crypto/asn1/tasn_dec.c
+++ b/crypto/asn1/tasn_dec.c
@@ -662,7 +662,11 @@ static int asn1_d2i_ex_primitive(ASN1_VALUE **pval, unsigned char **in, long inl
                 * internally irrespective of the type. So instead just check
                 * for UNIVERSAL class and ignore the tag.
                 */
-               if(!asn1_collect(&buf, &p, plen, inf, -1, V_ASN1_UNIVERSAL)) goto err;
+               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)) {