Commit 9df990cd authored by Rich Salz's avatar Rich Salz
Browse files

Check for failures, to avoid memory leak 



Thanks to Jiecheng Wu, Zuxing Gu for the report.

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6791)

(cherry picked from commit 037241bf)
(Only the EC part)
parent a8a97452

crypto/ec/ec_ameth.c

+10 −10
Original line number Diff line number Diff line
@@ -143,19 +143,19 @@ static int eckey_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey) 
static EC_KEY *eckey_type2param(int ptype, void *pval)

{

    EC_KEY *eckey = NULL;

    EC_GROUP *group = NULL;



    if (ptype == V_ASN1_SEQUENCE) {

        ASN1_STRING *pstr = pval;

        const unsigned char *pm = NULL;

        int pmlen;

        pm = pstr->data;

        pmlen = pstr->length;

        if (!(eckey = d2i_ECParameters(NULL, &pm, pmlen))) {

        const ASN1_STRING *pstr = pval;

        const unsigned char *pm = pstr->data;

        int pmlen = pstr->length;



        if ((eckey = d2i_ECParameters(NULL, &pm, pmlen)) == NULL) {

            ECerr(EC_F_ECKEY_TYPE2PARAM, EC_R_DECODE_ERROR);

            goto ecerr;

        }

    } else if (ptype == V_ASN1_OBJECT) {

        ASN1_OBJECT *poid = pval;

        EC_GROUP *group;

        const ASN1_OBJECT *poid = pval;



        /*

         * type == V_ASN1_OBJECT => the parameters are given by an asn1 OID
@@ -179,8 +179,8 @@ static EC_KEY *eckey_type2param(int ptype, void *pval) 
    return eckey;



 ecerr:

    if (eckey)

    EC_KEY_free(eckey);

    EC_GROUP_free(group);

    return NULL;

}