summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs7
diff options
context:
space:
mode:
authorNils Larsch <nils@openssl.org>2005-05-19 22:11:22 +0000
committerNils Larsch <nils@openssl.org>2005-05-19 22:11:22 +0000
commitf32e0035a30e1056ea99bdb2c5ad3730450cf86d (patch)
tree7e03bfe3851baa4a2097af0c91989d8aa8711602 /crypto/pkcs7
parent7b1e7706d8d69f09767e527116aa5ec0a8447a63 (diff)
fix potential memory leak
Submitted by: Goetz Babin-Ebell
Diffstat (limited to 'crypto/pkcs7')
-rw-r--r--crypto/pkcs7/pk7_smime.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index d37be48239..b6146d75c4 100644
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -88,6 +88,7 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
if (!(si = PKCS7_add_signature(p7,signcert,pkey,EVP_sha1()))) {
PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_ADD_SIGNATURE_ERROR);
+ PKCS7_free(p7);
return NULL;
}
@@ -105,6 +106,7 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
{
if(!(smcap = sk_X509_ALGOR_new_null())) {
PKCS7err(PKCS7_F_PKCS7_SIGN,ERR_R_MALLOC_FAILURE);
+ PKCS7_free(p7);
return NULL;
}
#ifndef OPENSSL_NO_DES
@@ -130,6 +132,7 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
if (!(p7bio = PKCS7_dataInit(p7, NULL))) {
PKCS7err(PKCS7_F_PKCS7_SIGN,ERR_R_MALLOC_FAILURE);
+ PKCS7_free(p7);
return NULL;
}
@@ -139,10 +142,12 @@ PKCS7 *PKCS7_sign(X509 *signcert, EVP_PKEY *pkey, STACK_OF(X509) *certs,
if (!PKCS7_dataFinal(p7,p7bio)) {
PKCS7err(PKCS7_F_PKCS7_SIGN,PKCS7_R_PKCS7_DATASIGN);
+ PKCS7_free(p7);
+ BIO_free_all(p7bio);
return NULL;
}
- BIO_free_all(p7bio);
+ BIO_free_all(p7bio);
return p7;
}