diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2019-09-09 20:26:17 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2019-09-09 20:26:17 +0000 |
| commit | e038c5399e742324ea5720f859c6aca1e1adb37a (patch) | |
| tree | 66552f1e58dc097f12d1bf6f33edcf8a4ad67341 /lib/libcrypto/ec/ec_ameth.c | |
| parent | a0258cfaca2842e071c42088e9041699bd79b414 (diff) | |
Plug memory leak in error paths. Found while comparing this file
with OpenSSL 1.1.1's version which contains a similar fix.
ok jsing
Diffstat (limited to 'lib/libcrypto/ec/ec_ameth.c')
| -rw-r--r-- | lib/libcrypto/ec/ec_ameth.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libcrypto/ec/ec_ameth.c b/lib/libcrypto/ec/ec_ameth.c index ad7b03f739d..2e73bdd2f6b 100644 --- a/lib/libcrypto/ec/ec_ameth.c +++ b/lib/libcrypto/ec/ec_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_ameth.c,v 1.27 2019/09/09 17:56:00 jsing Exp $ */ +/* $OpenBSD: ec_ameth.c,v 1.28 2019/09/09 20:26:16 tb Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -143,6 +143,7 @@ eckey_pub_encode(X509_PUBKEY * pk, const EVP_PKEY * pkey) static EC_KEY * eckey_type2param(int ptype, const void *pval) { + EC_GROUP *group = NULL; EC_KEY *eckey = NULL; if (ptype == V_ASN1_SEQUENCE) { @@ -158,7 +159,6 @@ eckey_type2param(int ptype, const void *pval) } } else if (ptype == V_ASN1_OBJECT) { const ASN1_OBJECT *poid = pval; - EC_GROUP *group; /* * type == V_ASN1_OBJECT => the parameters are given by an @@ -174,17 +174,17 @@ eckey_type2param(int ptype, const void *pval) EC_GROUP_set_asn1_flag(group, OPENSSL_EC_NAMED_CURVE); if (EC_KEY_set_group(eckey, group) == 0) goto ecerr; - EC_GROUP_free(group); } else { ECerror(EC_R_DECODE_ERROR); goto ecerr; } + EC_GROUP_free(group); return eckey; ecerr: - if (eckey) - EC_KEY_free(eckey); + EC_KEY_free(eckey); + EC_GROUP_free(group); return NULL; } |