Commit 4fd35d83 authored by Yuchi's avatar Yuchi Committed by Matt Caswell
Browse files

mem leak on error path and error propagation fix 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2559)
(cherry picked from commit e0670973)
parent 07109409

crypto/ec/ec_ameth.c

+3 −1
Original line number Diff line number Diff line
@@ -342,8 +342,10 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey) 
    }



    if (!PKCS8_pkey_set0(p8, OBJ_nid2obj(NID_X9_62_id_ecPublicKey), 0,

                         ptype, pval, ep, eplen))

                         ptype, pval, ep, eplen)) {

        OPENSSL_free(ep);

        return 0;

    }



    return 1;

}

ssl/ssl_ciph.c

+1 −1
Original line number Diff line number Diff line
@@ -2001,7 +2001,7 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm) 
    if (id < 193 || id > 255) {

        SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,

               SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE);

        return 0;

        return 1;

    }



    MemCheck_off();