diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2012-02-27 16:46:34 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2012-02-27 16:46:34 +0000 |
| commit | 161c9b426222ceb9397257f017a5dfff840aa518 (patch) | |
| tree | 5306851f38fe1d3e576a6cf10199aaca307047ed /crypto/pkcs12 | |
| parent | 57cb030cea44691b54b8d0df64caa764b8583358 (diff) | |
| download | openssl-161c9b426222ceb9397257f017a5dfff840aa518.tar.gz | |
PR: 2737
Submitted by: Remi Gacogne <rgacogne-bugs@coredump.fr>
Fix double free in PKCS12_parse if we run out of memory.
Diffstat (limited to 'crypto/pkcs12')
| -rw-r--r-- | crypto/pkcs12/p12_kiss.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs12/p12_kiss.c b/crypto/pkcs12/p12_kiss.c index 292cc3ed4a..206b1b0b18 100644 --- a/crypto/pkcs12/p12_kiss.c +++ b/crypto/pkcs12/p12_kiss.c @@ -167,7 +167,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, if (cert && *cert) X509_free(*cert); if (x) - X509_free(*cert); + X509_free(x); if (ocerts) sk_X509_pop_free(ocerts, X509_free); return 0; |