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 /demos/cms | |
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 'demos/cms')
-rw-r--r-- | demos/cms/cms_comp.c | 6 | ||||
-rw-r--r-- | demos/cms/cms_ddec.c | 12 | ||||
-rw-r--r-- | demos/cms/cms_dec.c | 9 | ||||
-rw-r--r-- | demos/cms/cms_denc.c | 12 | ||||
-rw-r--r-- | demos/cms/cms_enc.c | 9 | ||||
-rw-r--r-- | demos/cms/cms_sign.c | 9 | ||||
-rw-r--r-- | demos/cms/cms_sign2.c | 9 | ||||
-rw-r--r-- | demos/cms/cms_uncomp.c | 6 | ||||
-rw-r--r-- | demos/cms/cms_ver.c | 9 |
9 files changed, 27 insertions, 54 deletions
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; |