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/ocsp | |
| parent | 7c82e339a677f8546e1456c7a8f6788598a9de43 (diff) | |
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/ocsp')
| -rw-r--r-- | crypto/ocsp/ocsp_lib.c | 3 | ||||
| -rw-r--r-- | crypto/ocsp/v3_ocsp.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/crypto/ocsp/ocsp_lib.c b/crypto/ocsp/ocsp_lib.c index 8e87f49a5d..34df9ac04e 100644 --- a/crypto/ocsp/ocsp_lib.c +++ b/crypto/ocsp/ocsp_lib.c @@ -110,8 +110,7 @@ OCSP_CERTID *OCSP_cert_id_new(const EVP_MD *dgst, goto err; alg = cid->hashAlgorithm; - if (alg->algorithm != NULL) - ASN1_OBJECT_free(alg->algorithm); + ASN1_OBJECT_free(alg->algorithm); if ((nid = EVP_MD_type(dgst)) == NID_undef) { OCSPerr(OCSP_F_OCSP_CERT_ID_NEW, OCSP_R_UNKNOWN_NID); goto err; diff --git a/crypto/ocsp/v3_ocsp.c b/crypto/ocsp/v3_ocsp.c index 655811671a..7e502d7962 100644 --- a/crypto/ocsp/v3_ocsp.c +++ b/crypto/ocsp/v3_ocsp.c @@ -247,7 +247,7 @@ static void *d2i_ocsp_nonce(void *a, const unsigned char **pp, long length) return os; err: - if (os && (!pos || (*pos != os))) + if ((pos == NULL) || (*pos != os)) ASN1_OCTET_STRING_free(os); OCSPerr(OCSP_F_D2I_OCSP_NONCE, ERR_R_MALLOC_FAILURE); return NULL; |