diff options
author | Rich Salz <rsalz@openssl.org> | 2015-04-11 16:32:54 -0400 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-04-11 16:32:54 -0400 |
commit | e0e920b1a063f14f36418f8795c96f2c649400e1 (patch) | |
tree | b1704b3c1e380e01ab8fce7806bbd8d1d6997fa2 /demos/smime | |
parent | a38537721dfdd853c40b4b4d99b57950075b0178 (diff) |
free NULL cleanup 9
Ongoing work to skip NULL check before calling free routine. This gets:
ecp_nistz256_pre_comp_free nistp224_pre_comp_free nistp256_pre_comp_free
nistp521_pre_comp_free PKCS7_free PKCS7_RECIP_INFO_free
PKCS7_SIGNER_INFO_free sk_PKCS7_pop_free PKCS8_PRIV_KEY_INFO_free
PKCS12_free PKCS12_SAFEBAG_free PKCS12_free sk_PKCS12_SAFEBAG_pop_free
SSL_CONF_CTX_free SSL_CTX_free SSL_SESSION_free SSL_free ssl_cert_free
ssl_sess_cert_free
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Diffstat (limited to 'demos/smime')
-rw-r--r-- | demos/smime/smdec.c | 6 | ||||
-rw-r--r-- | demos/smime/smenc.c | 7 | ||||
-rw-r--r-- | demos/smime/smsign.c | 6 | ||||
-rw-r--r-- | demos/smime/smsign2.c | 10 | ||||
-rw-r--r-- | demos/smime/smver.c | 9 |
5 files changed, 5 insertions, 33 deletions
diff --git a/demos/smime/smdec.c b/demos/smime/smdec.c index a418707b6b..9752dea1f9 100644 --- a/demos/smime/smdec.c +++ b/demos/smime/smdec.c @@ -53,18 +53,14 @@ int main(int argc, char **argv) ret = 0; err: - if (ret) { fprintf(stderr, "Error Signing Data\n"); ERR_print_errors_fp(stderr); } - - if (p7) - PKCS7_free(p7); + PKCS7_free(p7); if (rcert) X509_free(rcert); EVP_PKEY_free(rkey); - BIO_free(in); BIO_free(out); BIO_free(tbio); diff --git a/demos/smime/smenc.c b/demos/smime/smenc.c index 5a85537ad0..2e594ee89e 100644 --- a/demos/smime/smenc.c +++ b/demos/smime/smenc.c @@ -67,23 +67,18 @@ int main(int argc, char **argv) ret = 0; err: - if (ret) { fprintf(stderr, "Error Encrypting Data\n"); ERR_print_errors_fp(stderr); } - - if (p7) - PKCS7_free(p7); + PKCS7_free(p7); if (rcert) X509_free(rcert); if (recips) sk_X509_pop_free(recips, X509_free); - BIO_free(in); BIO_free(out); BIO_free(tbio); - return ret; } diff --git a/demos/smime/smsign.c b/demos/smime/smsign.c index 455efcb483..91ab8e475d 100644 --- a/demos/smime/smsign.c +++ b/demos/smime/smsign.c @@ -63,18 +63,14 @@ int main(int argc, char **argv) ret = 0; err: - if (ret) { fprintf(stderr, "Error Signing Data\n"); ERR_print_errors_fp(stderr); } - - if (p7) - PKCS7_free(p7); + PKCS7_free(p7); if (scert) X509_free(scert); EVP_PKEY_free(skey); - BIO_free(in); BIO_free(out); BIO_free(tbio); diff --git a/demos/smime/smsign2.c b/demos/smime/smsign2.c index 5f20a40349..0ad709d041 100644 --- a/demos/smime/smsign2.c +++ b/demos/smime/smsign2.c @@ -71,27 +71,19 @@ int main(int argc, char **argv) ret = 0; err: - if (ret) { fprintf(stderr, "Error Signing Data\n"); ERR_print_errors_fp(stderr); } - - if (p7) - PKCS7_free(p7); - + PKCS7_free(p7); if (scert) X509_free(scert); EVP_PKEY_free(skey); - if (scert2) X509_free(scert2); EVP_PKEY_free(skey2); - BIO_free(in); BIO_free(out); BIO_free(tbio); - return ret; - } diff --git a/demos/smime/smver.c b/demos/smime/smver.c index 4088d3c38e..c4b6e751a9 100644 --- a/demos/smime/smver.c +++ b/demos/smime/smver.c @@ -61,22 +61,15 @@ int main(int argc, char **argv) ret = 0; err: - if (ret) { fprintf(stderr, "Error Verifying Data\n"); ERR_print_errors_fp(stderr); } - - if (p7) - PKCS7_free(p7); - + PKCS7_free(p7); if (cacert) X509_free(cacert); - BIO_free(in); BIO_free(out); BIO_free(tbio); - return ret; - } |