From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 9 Mar 2009 13:08:04 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bb7ccdfbe22aac18b26278d862050fbfee9d1b79;p=oweals%2Fopenssl.git

Update from stable branch.
---

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;