From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 9 Mar 2009 13:07:16 +0000 (+0000)
Subject: PR: 1856
X-Git-Tag: OpenSSL_0_9_8k~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fe9c925d20165acdbde281ec06d84027d8bd679;p=openssl

PR: 1856

Check return value of PKCS12_add_safes()
---

diff --git a/crypto/pkcs12/p12_crt.c b/crypto/pkcs12/p12_crt.c
index e863de52ce..9522342fa5 100644
--- a/crypto/pkcs12/p12_crt.c
+++ b/crypto/pkcs12/p12_crt.c
@@ -170,6 +170,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;