diff options
| author | Rich Salz <rsalz@openssl.org> | 2015-03-25 11:31:18 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-03-25 11:31:18 -0400 |
| commit | ca3a82c3b364e1e584546f0f3bbb938b0b472580 (patch) | |
| tree | 06c73d297f19629c1bf56bbf06dd2d443d4ac78f /engines | |
| parent | 2011b169fa90edd4d986e7dbbd3d64587d316a22 (diff) | |
free NULL cleanup
This commit handles BIO_ACCEPT_free BIO_CB_FREE BIO_CONNECT_free
BIO_free BIO_free_all BIO_vfree
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/e_chil.c | 9 | ||||
| -rw-r--r-- | engines/e_sureware.c | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/engines/e_chil.c b/engines/e_chil.c index 19d29d7e62..c06ab1a1e6 100644 --- a/engines/e_chil.c +++ b/engines/e_chil.c @@ -656,8 +656,7 @@ static int hwcrhk_finish(ENGINE *e) goto err; } err: - if (logstream) - BIO_free(logstream); + BIO_free(logstream); hwcrhk_dso = NULL; p_hwcrhk_Init = NULL; p_hwcrhk_Finish = NULL; @@ -693,10 +692,8 @@ static int hwcrhk_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f) (void)) BIO *bio = (BIO *)p; CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); - if (logstream) { - BIO_free(logstream); - logstream = NULL; - } + BIO_free(logstream); + logstream = NULL; if (CRYPTO_add(&bio->references, 1, CRYPTO_LOCK_BIO) > 1) logstream = bio; else diff --git a/engines/e_sureware.c b/engines/e_sureware.c index 3c7b2b26bf..5e1786ca0f 100644 --- a/engines/e_sureware.c +++ b/engines/e_sureware.c @@ -404,10 +404,8 @@ static int surewarehk_ctrl(ENGINE *e, int cmd, long i, void *p, { BIO *bio = (BIO *)p; CRYPTO_w_lock(CRYPTO_LOCK_ENGINE); - if (logstream) { - BIO_free(logstream); - logstream = NULL; - } + BIO_free(logstream); + logstream = NULL; if (CRYPTO_add(&bio->references, 1, CRYPTO_LOCK_BIO) > 1) logstream = bio; else @@ -596,8 +594,7 @@ static int surewarehk_finish(ENGINE *e) goto err; } err: - if (logstream) - BIO_free(logstream); + BIO_free(logstream); surewarehk_dso = NULL; p_surewarehk_Init = NULL; p_surewarehk_Finish = NULL; |