diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-04-30 18:10:52 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-04-30 18:10:52 -0400 |
| commit | 895cba195a0c8430dcc8d1aa22b75eccaaee8f49 (patch) | |
| tree | 198a8361064426dbc73c52143123835dfc8017a2 /apps | |
| parent | b0696f8b0b6e9a837e0abe4d79a8219e287c9036 (diff) | |
free cleanup 12
Don't check for NULL before calling free function. This gets:
NAME_CONSTRAINTS_free GENERAL_SUBTREE_free ECDSA_METHOD_free
JPAKE_CTX_free OCSP_REQ_CTX_free SCT_free SRP_VBASE_free
SRP_gN_free SRP_user_pwd_free TXT_DB_free
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/apps.c | 9 | ||||
| -rw-r--r-- | apps/ocsp.c | 3 |
2 files changed, 4 insertions, 8 deletions
diff --git a/apps/apps.c b/apps/apps.c index aecd6120f9..904629b2f1 100644 --- a/apps/apps.c +++ b/apps/apps.c @@ -600,8 +600,7 @@ int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl) OPENSSL_free(port); if (bio) BIO_free_all(bio); - if (rctx) - OCSP_REQ_CTX_free(rctx); + OCSP_REQ_CTX_free(rctx); if (rv != 1) { BIO_printf(bio_err, "Error loading %s from %s\n", pcert ? "certificate" : "CRL", url); @@ -1614,8 +1613,7 @@ CA_DB *load_index(char *dbfile, DB_ATTR *db_attr) err: if (dbattr_conf) NCONF_free(dbattr_conf); - if (tmpdb) - TXT_DB_free(tmpdb); + TXT_DB_free(tmpdb); BIO_free_all(in); return retdb; } @@ -1793,8 +1791,7 @@ int rotate_index(const char *dbfile, const char *new_suffix, void free_index(CA_DB *db) { if (db) { - if (db->db) - TXT_DB_free(db->db); + TXT_DB_free(db->db); OPENSSL_free(db); } } diff --git a/apps/ocsp.c b/apps/ocsp.c index 680cc0a79e..20dc1ae4cc 100644 --- a/apps/ocsp.c +++ b/apps/ocsp.c @@ -1229,8 +1229,7 @@ static OCSP_RESPONSE *query_responder(BIO *cbio, const char *path, } err: - if (ctx) - OCSP_REQ_CTX_free(ctx); + OCSP_REQ_CTX_free(ctx); return rsp; } |