diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-03-24 10:17:37 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@akamai.com> | 2015-03-24 23:17:16 -0400 |
| commit | d64070838ebba86f00fb3755df5d3e65106e1628 (patch) | |
| tree | def90b3063d9ebe0f53920604d02b9786216e327 /crypto/pem | |
| parent | 1300705a47b9c9498b15a384c6c5348adc342e2c (diff) | |
| download | openssl-d64070838ebba86f00fb3755df5d3e65106e1628.tar.gz | |
free NULL cleanup
Start ensuring all OpenSSL "free" routines allow NULL, and remove
any if check before calling them.
This gets DH_free, DSA_free, RSA_free
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pvkfmt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c index ee4b6a8241..0f2390d3b4 100644 --- a/crypto/pem/pvkfmt.c +++ b/crypto/pem/pvkfmt.c @@ -335,8 +335,7 @@ static EVP_PKEY *b2i_dss(const unsigned char **in, unsigned int length, memerr: PEMerr(PEM_F_B2I_DSS, ERR_R_MALLOC_FAILURE); - if (dsa) - DSA_free(dsa); + DSA_free(dsa); if (ret) EVP_PKEY_free(ret); if (ctx) @@ -385,8 +384,7 @@ static EVP_PKEY *b2i_rsa(const unsigned char **in, unsigned int length, return ret; memerr: PEMerr(PEM_F_B2I_RSA, ERR_R_MALLOC_FAILURE); - if (rsa) - RSA_free(rsa); + RSA_free(rsa); if (ret) EVP_PKEY_free(ret); return NULL; |