From bb7ccdfbe22aac18b26278d862050fbfee9d1b79 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Mon, 9 Mar 2009 13:08:04 +0000 Subject: Update from stable branch. --- crypto/pkcs12/p12_crt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c index acac216739..96b131defa 100644 --- a/crypto/pkcs12/p12_crt.c +++ b/crypto/pkcs12/p12_crt.c @@ -159,6 +159,9 @@ PKCS12 *PKCS12_create(char *pass, char *name, EVP_PKEY *pkey, X509 *cert, p12 = PKCS12_add_safes(safes, 0); + if (!p12) + goto err; + sk_PKCS7_pop_free(safes, PKCS7_free); safes = NULL; -- cgit v1.2.1