diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-05-01 14:37:16 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-05-01 14:37:16 -0400 |
| commit | 25aaa98aa249d26391c1994d2de449562c8b8b99 (patch) | |
| tree | 6f83efd87fa9fd832e8a456e9686143a29f1dab3 /crypto/pem | |
| parent | 666964780a245c14e8f0eb6e13dd854a37387ea9 (diff) | |
| download | openssl-25aaa98aa249d26391c1994d2de449562c8b8b99.tar.gz | |
free NULL cleanup -- coda
After the finale, the "real" final part. :) Do a recursive grep with
"-B1 -w [a-zA-Z0-9_]*_free" to see if any of the preceeding lines are
an "if NULL" check that can be removed.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pvkfmt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/pem/pvkfmt.c b/crypto/pem/pvkfmt.c index 9e9c948532..d2a5952c9e 100644 --- a/crypto/pem/pvkfmt.c +++ b/crypto/pem/pvkfmt.c @@ -674,6 +674,7 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, const unsigned char *p = *in; unsigned int magic; unsigned char *enctmp = NULL, *q; + EVP_CIPHER_CTX cctx; EVP_CIPHER_CTX_init(&cctx); if (saltlen) { @@ -736,8 +737,7 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, ret = b2i_PrivateKey(&p, keylen); err: EVP_CIPHER_CTX_cleanup(&cctx); - if (saltlen) - OPENSSL_free(enctmp); + OPENSSL_free(enctmp); return ret; } |