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>

18 files changed, 50 insertions, 100 deletions

diff --git a/demos/b64.c b/demos/b64.c
index d8ed2a6a04..fcc69562c1 100644
--- a/demos/b64.c
+++ b/demos/b64.c
@@ -243,13 +243,9 @@ char **argv;
         OPENSSL_free(strbuf);
     if (buff != NULL)
         OPENSSL_free(buff);
-    if (in != NULL)
-        BIO_free(in);
-    if (out != NULL)
-        BIO_free(out);
-    if (benc != NULL)
-        BIO_free(benc);
-    if (b64 != NULL)
-        BIO_free(b64);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(benc);
+    BIO_free(b64);
     EXIT(ret);
 }
diff --git a/demos/bio/saccept.c b/demos/bio/saccept.c
index 8c75029384..505d98b68f 100644
--- a/demos/bio/saccept.c
+++ b/demos/bio/saccept.c
@@ -22,8 +22,7 @@ BIO *in = NULL;
 
 void close_up()
 {
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
 }
 
 int main(int argc, char *argv[])
@@ -101,8 +100,7 @@ int main(int argc, char *argv[])
     if (ret) {
         ERR_print_errors_fp(stderr);
     }
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     exit(ret);
     return (!ret);
 }
diff --git a/demos/bio/server-arg.c b/demos/bio/server-arg.c
index 7ba54dbe50..4f65227e40 100644
--- a/demos/bio/server-arg.c
+++ b/demos/bio/server-arg.c
@@ -137,8 +137,7 @@ int main(int argc, char *argv[])
     if (ret) {
         ERR_print_errors_fp(stderr);
     }
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     exit(ret);
     return (!ret);
 }
diff --git a/demos/bio/server-conf.c b/demos/bio/server-conf.c
index a09bc9320d..5355839f4f 100644
--- a/demos/bio/server-conf.c
+++ b/demos/bio/server-conf.c
@@ -131,8 +131,7 @@ int main(int argc, char *argv[])
     if (ret) {
         ERR_print_errors_fp(stderr);
     }
-    if (in != NULL)
-        BIO_free(in);
+    BIO_free(in);
     exit(ret);
     return (!ret);
 }
diff --git a/demos/cms/cms_comp.c b/demos/cms/cms_comp.c
index 059152fe0e..e117d37b5e 100644
--- a/demos/cms/cms_comp.c
+++ b/demos/cms/cms_comp.c
@@ -50,10 +50,8 @@ int main(int argc, char **argv)
 
     if (cms)
         CMS_ContentInfo_free(cms);
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
+    BIO_free(in);
+    BIO_free(out);
 
     return ret;
 
diff --git a/demos/cms/cms_ddec.c b/demos/cms/cms_ddec.c
index 37ac97fd01..7247e57112 100644
--- a/demos/cms/cms_ddec.c
+++ b/demos/cms/cms_ddec.c
@@ -75,14 +75,10 @@ int main(int argc, char **argv)
     if (rkey)
         EVP_PKEY_free(rkey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
-    if (dcont)
-        BIO_free(dcont);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
+    BIO_free(dcont);
 
     return ret;
 
diff --git a/demos/cms/cms_dec.c b/demos/cms/cms_dec.c
index 3291eacab4..e9782d7c23 100644
--- a/demos/cms/cms_dec.c
+++ b/demos/cms/cms_dec.c
@@ -66,12 +66,9 @@ int main(int argc, char **argv)
     if (rkey)
         EVP_PKEY_free(rkey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_denc.c b/demos/cms/cms_denc.c
index c86a5fd728..852671771c 100644
--- a/demos/cms/cms_denc.c
+++ b/demos/cms/cms_denc.c
@@ -84,14 +84,10 @@ int main(int argc, char **argv)
     if (recips)
         sk_X509_pop_free(recips, X509_free);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (dout)
-        BIO_free(dout);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(dout);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_enc.c b/demos/cms/cms_enc.c
index e8ecb48e27..4395e6b04f 100644
--- a/demos/cms/cms_enc.c
+++ b/demos/cms/cms_enc.c
@@ -80,12 +80,9 @@ int main(int argc, char **argv)
     if (recips)
         sk_X509_pop_free(recips, X509_free);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_sign.c b/demos/cms/cms_sign.c
index 4bf85d1384..9f2cff0dbe 100644
--- a/demos/cms/cms_sign.c
+++ b/demos/cms/cms_sign.c
@@ -76,12 +76,9 @@ int main(int argc, char **argv)
     if (skey)
         EVP_PKEY_free(skey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_sign2.c b/demos/cms/cms_sign2.c
index 7e98a51713..23c6eb8f9f 100644
--- a/demos/cms/cms_sign2.c
+++ b/demos/cms/cms_sign2.c
@@ -90,12 +90,9 @@ int main(int argc, char **argv)
     if (skey)
         EVP_PKEY_free(skey2);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/cms/cms_uncomp.c b/demos/cms/cms_uncomp.c
index 392f4b4502..8d45834c34 100644
--- a/demos/cms/cms_uncomp.c
+++ b/demos/cms/cms_uncomp.c
@@ -45,10 +45,8 @@ int main(int argc, char **argv)
     if (cms)
         CMS_ContentInfo_free(cms);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
+    BIO_free(in);
+    BIO_free(out);
 
     return ret;
 
diff --git a/demos/cms/cms_ver.c b/demos/cms/cms_ver.c
index ca935517a7..422753163e 100644
--- a/demos/cms/cms_ver.c
+++ b/demos/cms/cms_ver.c
@@ -73,12 +73,9 @@ int main(int argc, char **argv)
     if (cacert)
         X509_free(cacert);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c
index 6814d5199b..b50f8dffaf 100644
--- a/demos/smime/smdec.c
+++ b/demos/smime/smdec.c
@@ -66,12 +66,9 @@ int main(int argc, char **argv)
     if (rkey)
         EVP_PKEY_free(rkey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smenc.c b/demos/smime/smenc.c
index 18bf7b1618..5a85537ad0 100644
--- a/demos/smime/smenc.c
+++ b/demos/smime/smenc.c
@@ -80,12 +80,9 @@ int main(int argc, char **argv)
     if (recips)
         sk_X509_pop_free(recips, X509_free);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c
index c7bf86d370..6b9dfdd771 100644
--- a/demos/smime/smsign.c
+++ b/demos/smime/smsign.c
@@ -76,12 +76,9 @@ int main(int argc, char **argv)
     if (skey)
         EVP_PKEY_free(skey);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c
index a116094341..5d9de35c46 100644
--- a/demos/smime/smsign2.c
+++ b/demos/smime/smsign2.c
@@ -90,12 +90,9 @@ int main(int argc, char **argv)
     if (skey)
         EVP_PKEY_free(skey2);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;
 
diff --git a/demos/smime/smver.c b/demos/smime/smver.c
index 21937df307..4088d3c38e 100644
--- a/demos/smime/smver.c
+++ b/demos/smime/smver.c
@@ -73,12 +73,9 @@ int main(int argc, char **argv)
     if (cacert)
         X509_free(cacert);
 
-    if (in)
-        BIO_free(in);
-    if (out)
-        BIO_free(out);
-    if (tbio)
-        BIO_free(tbio);
+    BIO_free(in);
+    BIO_free(out);
+    BIO_free(tbio);
 
     return ret;