free null cleanup finale

Don't check for NULL before calling OPENSSL_free

Reviewed-by: Richard Levitte <levitte@openssl.org>

6 files changed, 24 insertions, 48 deletions

diff --git a/test/dhtest.c b/test/dhtest.c
index 8f71723b31..621fcba506 100644
--- a/test/dhtest.c
+++ b/test/dhtest.c
@@ -195,10 +195,8 @@ int main(int argc, char *argv[])
  err:
     ERR_print_errors_fp(stderr);
 
-    if (abuf != NULL)
-        OPENSSL_free(abuf);
-    if (bbuf != NULL)
-        OPENSSL_free(bbuf);
+    OPENSSL_free(abuf);
+    OPENSSL_free(bbuf);
     DH_free(b);
     DH_free(a);
     BN_GENCB_free(_cb);
diff --git a/test/ecdhtest.c b/test/ecdhtest.c
index af124764c8..47c8185b77 100644
--- a/test/ecdhtest.c
+++ b/test/ecdhtest.c
@@ -278,10 +278,8 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
  err:
     ERR_print_errors_fp(stderr);
 
-    if (abuf != NULL)
-        OPENSSL_free(abuf);
-    if (bbuf != NULL)
-        OPENSSL_free(bbuf);
+    OPENSSL_free(abuf);
+    OPENSSL_free(bbuf);
     BN_free(x_a);
     BN_free(y_a);
     BN_free(x_b);
@@ -433,8 +431,7 @@ static int ecdh_kat(BIO *out, const char *cname, int nid,
  err:
     EC_KEY_free(key1);
     EC_KEY_free(key2);
-    if (Ztmp)
-        OPENSSL_free(Ztmp);
+    OPENSSL_free(Ztmp);
     if (rv)
         BIO_puts(out, " ok\n");
     else {
diff --git a/test/ecdsatest.c b/test/ecdsatest.c
index 1eeaabaa04..52326c5e23 100644
--- a/test/ecdsatest.c
+++ b/test/ecdsatest.c
@@ -504,12 +504,9 @@ int test_builtin(BIO *out)
     EC_KEY_free(wrong_eckey);
     if (ecdsa_sig)
         ECDSA_SIG_free(ecdsa_sig);
-    if (signature)
-        OPENSSL_free(signature);
-    if (raw_buf)
-        OPENSSL_free(raw_buf);
-    if (curves)
-        OPENSSL_free(curves);
+    OPENSSL_free(signature);
+    OPENSSL_free(raw_buf);
+    OPENSSL_free(curves);
 
     return ret;
 }
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 5641d98fee..ac79388fad 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -320,9 +320,7 @@ static int test_EVP_DigestSignInit(void)
     EVP_MD_CTX_cleanup(&md_ctx);
     EVP_MD_CTX_cleanup(&md_ctx_verify);
     EVP_PKEY_free(pkey);
-    if (sig) {
-        OPENSSL_free(sig);
-    }
+    OPENSSL_free(sig);
 
     return ret;
 }
diff --git a/test/evp_test.c b/test/evp_test.c
index 68d5bde300..7187624d58 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -249,10 +249,8 @@ static void hex_print(const char *name, const unsigned char *buf, size_t len)
 
 static void free_expected(struct evp_test *t)
 {
-    if (t->expected_err) {
-        OPENSSL_free(t->expected_err);
-        t->expected_err = NULL;
-    }
+    OPENSSL_free(t->expected_err);
+    t->expected_err = NULL;
     if (t->out_expected) {
         OPENSSL_free(t->out_expected);
         OPENSSL_free(t->out_got);
@@ -320,10 +318,8 @@ static int setup_test(struct evp_test *t, const struct evp_test_method *tmeth)
         t->meth->cleanup(t);
         OPENSSL_free(t->data);
         t->data = NULL;
-        if (t->expected_err) {
-            OPENSSL_free(t->expected_err);
-            t->expected_err = NULL;
-        }
+        OPENSSL_free(t->expected_err);
+        t->expected_err = NULL;
         free_expected(t);
     }
     t->meth = tmeth;
@@ -534,8 +530,7 @@ int main(int argc, char **argv)
 
 static void test_free(void *d)
 {
-    if (d)
-        OPENSSL_free(d);
+    OPENSSL_free(d);
 }
 
 /* Message digest tests */
@@ -861,8 +856,7 @@ static int cipher_test_enc(struct evp_test *t, int enc)
     }
     err = NULL;
  err:
-    if (tmp)
-        OPENSSL_free(tmp);
+    OPENSSL_free(tmp);
     EVP_CIPHER_CTX_free(ctx);
     t->err = err;
     return err ? 0 : 1;
@@ -1049,8 +1043,7 @@ static int mac_test_run(struct evp_test *t)
  err:
     if (mctx)
         EVP_MD_CTX_destroy(mctx);
-    if (mac)
-        OPENSSL_free(mac);
+    OPENSSL_free(mac);
     EVP_PKEY_CTX_free(genctx);
     EVP_PKEY_free(key);
     t->err = err;
@@ -1133,10 +1126,9 @@ static int pkey_test_init(struct evp_test *t, const char *name,
 static void pkey_test_cleanup(struct evp_test *t)
 {
     struct pkey_data *kdata = t->data;
-    if (kdata->input)
-        OPENSSL_free(kdata->input);
-    if (kdata->output)
-        OPENSSL_free(kdata->output);
+
+    OPENSSL_free(kdata->input);
+    OPENSSL_free(kdata->output);
     EVP_PKEY_CTX_free(kdata->ctx);
 }
 
@@ -1185,8 +1177,7 @@ static int pkey_test_run(struct evp_test *t)
         goto err;
     err = NULL;
  err:
-    if (out)
-        OPENSSL_free(out);
+    OPENSSL_free(out);
     t->err = err;
     return 1;
 }
diff --git a/test/ssltest.c b/test/ssltest.c
index 311fbc9d61..8b5ff3e426 100644
--- a/test/ssltest.c
+++ b/test/ssltest.c
@@ -466,10 +466,8 @@ static int verify_alpn(SSL *client, SSL *server)
     SSL_get0_alpn_selected(client, &client_proto, &client_proto_len);
     SSL_get0_alpn_selected(server, &server_proto, &server_proto_len);
 
-    if (alpn_selected != NULL) {
-        OPENSSL_free(alpn_selected);
-        alpn_selected = NULL;
-    }
+    OPENSSL_free(alpn_selected);
+    alpn_selected = NULL;
 
     if (client_proto_len != server_proto_len ||
         memcmp(client_proto, server_proto, client_proto_len) != 0) {
@@ -2457,11 +2455,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
     BIO_free(s_to_c);
     BIO_free_all(c_bio);
     BIO_free_all(s_bio);
-
-    if (cbuf)
-        OPENSSL_free(cbuf);
-    if (sbuf)
-        OPENSSL_free(sbuf);
+    OPENSSL_free(cbuf);
+    OPENSSL_free(sbuf);
 
     return (ret);
 }