Commit 6f414aef authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from HEAD.

parent 45e33ebe

crypto/asn1/tasn_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -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)) {