Commit 2c6b1419 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 2090 

Submitted by: Martin Kaiser <lists@kaiser.cx>, Stephen Henson
Approved by: steve@openssl.org

Improve error checking in asn1_gen.c
parent af13c50d

crypto/asn1/asn1_gen.c

+6 −1
Original line number Diff line number Diff line
@@ -446,6 +446,8 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf) 
	int derlen;

	int i, is_set;

	sk = sk_ASN1_TYPE_new_null();

	if (!sk)

		goto bad;

	if (section)

		{

		if (!cnf)
@@ -458,7 +460,8 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf) 
			typ = ASN1_generate_v3(sk_CONF_VALUE_value(sect, i)->value, cnf);

			if (!typ)

				goto bad;

			sk_ASN1_TYPE_push(sk, typ);

			if (!sk_ASN1_TYPE_push(sk, typ))

				goto bad;

			typ = NULL;

			}

		}
@@ -474,6 +477,8 @@ static ASN1_TYPE *asn1_multi(int utype, const char *section, X509V3_CTX *cnf) 
	derlen = i2d_ASN1_SET_OF_ASN1_TYPE(sk, NULL, i2d_ASN1_TYPE, utype,

					   V_ASN1_UNIVERSAL, is_set);

	der = OPENSSL_malloc(derlen);

	if (!der)

		goto bad;

	p = der;

	i2d_ASN1_SET_OF_ASN1_TYPE(sk, &p, i2d_ASN1_TYPE, utype,

				  V_ASN1_UNIVERSAL, is_set);