From 2b6e09b39ef1d803b50ee024a06d1c250fde442d Mon Sep 17 00:00:00 2001
From: djm <>
Date: Mon, 6 Apr 2009 06:30:10 +0000
Subject: import of OpenSSL 0.9.8k

---
 src/lib/libcrypto/pkcs12/p12_crt.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/lib/libcrypto/pkcs12')

diff --git a/src/lib/libcrypto/pkcs12/p12_crt.c b/src/lib/libcrypto/pkcs12/p12_crt.c
index e863de52ce..9522342fa5 100644
--- a/src/lib/libcrypto/pkcs12/p12_crt.c
+++ b/src/lib/libcrypto/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;
-- 
cgit v1.2.3-55-g6feb