summaryrefslogtreecommitdiffstats
path: root/crypto/pkcs12
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-02-27 16:46:45 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-02-27 16:46:45 +0000
commitb527b6e8ff743702c7c503a1b79050127eb5fe7a (patch)
treeee9d63b39686e9e0655b885edf9424cd50bbdac7 /crypto/pkcs12
parenta54ce007e677ddd3a0cc4a3e4b47e823076117fa (diff)
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.c2
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;