PR: 2737
authorDr. Stephen Henson <steve@openssl.org>
Mon, 27 Feb 2012 16:46:34 +0000 (16:46 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 27 Feb 2012 16:46:34 +0000 (16:46 +0000)
Submitted by: Remi Gacogne <rgacogne-bugs@coredump.fr>

Fix double free in PKCS12_parse if we run out of memory.

crypto/pkcs12/p12_kiss.c

index 292cc3e..206b1b0 100644 (file)
@@ -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;