diff options
| author | steve <steve> | 2012-02-27 16:46:34 +0000 |
|---|---|---|
| committer | steve <steve> | 2012-02-27 16:46:34 +0000 |
| commit | cbff6dd5f2d248fd498d1c840497637332b80f8d (patch) | |
| tree | b42654b7481f503bf1bf088c7f29380dbc2e4834 | |
| parent | 17fc4b403e758648b08147f6b2bb414c422c6d73 (diff) | |
| download | openssl-cbff6dd5f2d248fd498d1c840497637332b80f8d.tar.gz | |
PR: 2737
Submitted by: Remi Gacogne <rgacogne-bugs@coredump.fr>
Fix double free in PKCS12_parse if we run out of memory.
| -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 292cc3ed4..206b1b0b1 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; |