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>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user