diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-30 17:33:59 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-30 17:33:59 -0400 |
| commit | 222561fe8ef510f336417a666f69f81ddc9b8fe4 (patch) | |
| tree | 70bc6af70550022bc7b7af45bd3c6d64d7fc2680 /crypto/asn1/x_pubkey.c | |
| parent | 2ace745022f5af0709297e96eb0b0829c87c4291 (diff) | |
| download | openssl-222561fe8ef510f336417a666f69f81ddc9b8fe4.zip openssl-222561fe8ef510f336417a666f69f81ddc9b8fe4.tar.gz openssl-222561fe8ef510f336417a666f69f81ddc9b8fe4.tar.bz2 | |
free NULL cleanup 5a
Don't check for NULL before calling a free routine. This gets X509_.*free:
x509_name_ex_free X509_policy_tree_free X509_VERIFY_PARAM_free
X509_STORE_free X509_STORE_CTX_free X509_PKEY_free
X509_OBJECT_free_contents X509_LOOKUP_free X509_INFO_free
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/asn1/x_pubkey.c')
| -rw-r--r-- | crypto/asn1/x_pubkey.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/crypto/asn1/x_pubkey.c b/crypto/asn1/x_pubkey.c index 3c72997..158c240 100644 --- a/crypto/asn1/x_pubkey.c +++ b/crypto/asn1/x_pubkey.c @@ -112,15 +112,12 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey) goto error; } - if (*x != NULL) - X509_PUBKEY_free(*x); - + X509_PUBKEY_free(*x); *x = pk; - return 1; + error: - if (pk != NULL) - X509_PUBKEY_free(pk); + X509_PUBKEY_free(pk); return 0; } |