diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-03-24 07:52:24 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-03-24 07:52:24 -0400 |
| commit | 0dfb9398bb6493d5a56216e0c7039cb3f9fc88c6 (patch) | |
| tree | 9ffaa0bec3d0f14092948174eeea90dc8e2ee7c4 /crypto/x509v3 | |
| parent | 7c82e339a677f8546e1456c7a8f6788598a9de43 (diff) | |
| download | openssl-0dfb9398bb6493d5a56216e0c7039cb3f9fc88c6.tar.gz | |
free NULL cleanup
Start ensuring all OpenSSL "free" routines allow NULL, and remove
any if check before calling them.
This gets ASN1_OBJECT_free and ASN1_STRING_free.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/x509v3')
| -rw-r--r-- | crypto/x509v3/pcy_data.c | 3 | ||||
| -rw-r--r-- | crypto/x509v3/v3_conf.c | 3 | ||||
| -rw-r--r-- | crypto/x509v3/v3_pci.c | 5 |
3 files changed, 3 insertions, 8 deletions
diff --git a/crypto/x509v3/pcy_data.c b/crypto/x509v3/pcy_data.c index 90e9970e46..3a8d4328d5 100644 --- a/crypto/x509v3/pcy_data.c +++ b/crypto/x509v3/pcy_data.c @@ -102,8 +102,7 @@ X509_POLICY_DATA *policy_data_new(POLICYINFO *policy, ret->expected_policy_set = sk_ASN1_OBJECT_new_null(); if (!ret->expected_policy_set) { OPENSSL_free(ret); - if (id) - ASN1_OBJECT_free(id); + ASN1_OBJECT_free(id); return NULL; } diff --git a/crypto/x509v3/v3_conf.c b/crypto/x509v3/v3_conf.c index 9631e57b77..eb9cfea66d 100644 --- a/crypto/x509v3/v3_conf.c +++ b/crypto/x509v3/v3_conf.c @@ -212,8 +212,7 @@ static X509_EXTENSION *do_ext_i2d(const X509V3_EXT_METHOD *method, X509V3err(X509V3_F_DO_EXT_I2D, ERR_R_MALLOC_FAILURE); if (ext_der != NULL) OPENSSL_free(ext_der); - if (ext_oct != NULL) - ASN1_OCTET_STRING_free(ext_oct); + ASN1_OCTET_STRING_free(ext_oct); return NULL; } diff --git a/crypto/x509v3/v3_pci.c b/crypto/x509v3/v3_pci.c index 5a937170f8..4139b34cbc 100644 --- a/crypto/x509v3/v3_pci.c +++ b/crypto/x509v3/v3_pci.c @@ -305,10 +305,7 @@ static PROXY_CERT_INFO_EXTENSION *r2i_pci(X509V3_EXT_METHOD *method, pathlen = NULL; goto end; err: - if (language) { - ASN1_OBJECT_free(language); - language = NULL; - } + ASN1_OBJECT_free(language); if (pathlen) { ASN1_INTEGER_free(pathlen); pathlen = NULL; |