diff options
author | mmcc <> | 2016-03-11 07:08:45 +0000 |
---|---|---|
committer | mmcc <> | 2016-03-11 07:08:45 +0000 |
commit | 13f852f88b7f59607c91ef9ac8a34ae4e55e08ca (patch) | |
tree | b799fc9672743546b69747e9e1d53d9423de380c /src/lib/libcrypto/cms/cms_sd.c | |
parent | e11a59757e997c4effb65f1ad3aa27df9dff42f5 (diff) | |
download | openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.tar.gz openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.tar.bz2 openbsd-13f852f88b7f59607c91ef9ac8a34ae4e55e08ca.zip |
X509_free(3) is NULL-safe, so remove NULL checks before its calls.
ok doug@
Diffstat (limited to 'src/lib/libcrypto/cms/cms_sd.c')
-rw-r--r-- | src/lib/libcrypto/cms/cms_sd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/libcrypto/cms/cms_sd.c b/src/lib/libcrypto/cms/cms_sd.c index f4119f7a1c..1623126e77 100644 --- a/src/lib/libcrypto/cms/cms_sd.c +++ b/src/lib/libcrypto/cms/cms_sd.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cms_sd.c,v 1.9 2014/11/09 19:17:13 miod Exp $ */ | 1 | /* $OpenBSD: cms_sd.c,v 1.10 2016/03/11 07:08:44 mmcc Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -498,8 +498,7 @@ CMS_SignerInfo_set1_signer_cert(CMS_SignerInfo *si, X509 *signer) | |||
498 | EVP_PKEY_free(si->pkey); | 498 | EVP_PKEY_free(si->pkey); |
499 | si->pkey = X509_get_pubkey(signer); | 499 | si->pkey = X509_get_pubkey(signer); |
500 | } | 500 | } |
501 | if (si->signer) | 501 | X509_free(si->signer); |
502 | X509_free(si->signer); | ||
503 | si->signer = signer; | 502 | si->signer = signer; |
504 | } | 503 | } |
505 | 504 | ||