wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Submitted by: Markus Friedl <mfriedl@gmail.com>

Browse source 
Fix memory leaks in 'goto err' cases.
This commit is contained in:
Dr. Stephen Henson 2012-03-22 15:44:51 +00:00
parent 7744ef1ada
commit f404acfa2c
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crypto/pkcs7/pk7_doit.c
View file

@ -430,6 +430,8 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
STACK_OF(X509_ALGOR) *md_sk=NULL; STACK_OF(X509_ALGOR) *md_sk=NULL;
STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL; STACK_OF(PKCS7_RECIP_INFO) *rsk=NULL;
PKCS7_RECIP_INFO *ri=NULL; PKCS7_RECIP_INFO *ri=NULL;
unsigned char *ek = NULL, *tkey = NULL;
int eklen = 0, tkeylen = 0;
i=OBJ_obj2nid(p7->type); i=OBJ_obj2nid(p7->type);
p7->state=PKCS7_S_HEADER; p7->state=PKCS7_S_HEADER;
@ -507,8 +509,6 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
int max; int max;
X509_OBJECT ret; X509_OBJECT ret;
#endif #endif
unsigned char *ek = NULL, *tkey = NULL;
int eklen, tkeylen;
if ((etmp=BIO_new(BIO_f_cipher())) == NULL) if ((etmp=BIO_new(BIO_f_cipher())) == NULL)
{ {
@ -609,11 +609,13 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
{ {
OPENSSL_cleanse(ek,eklen); OPENSSL_cleanse(ek,eklen);
OPENSSL_free(ek); OPENSSL_free(ek);
ek = NULL;
} }
if (tkey) if (tkey)
{ {
OPENSSL_cleanse(tkey,tkeylen); OPENSSL_cleanse(tkey,tkeylen);
OPENSSL_free(tkey); OPENSSL_free(tkey);
tkey = NULL;
} }
if (out == NULL) if (out == NULL)
@ -656,6 +658,16 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert)
if (0) if (0)
{ {
err: err:
if (ek)
{
OPENSSL_cleanse(ek,eklen);
OPENSSL_free(ek);
}
if (tkey)
{
OPENSSL_cleanse(tkey,tkeylen);
OPENSSL_free(tkey);
}
if (out != NULL) BIO_free_all(out); if (out != NULL) BIO_free_all(out);
if (btmp != NULL) BIO_free_all(btmp); if (btmp != NULL) BIO_free_all(btmp);
if (etmp != NULL) BIO_free_all(etmp); if (etmp != NULL) BIO_free_all(etmp);