summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-03-09 13:08:04 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-03-09 13:08:04 +0000
commitbb7ccdfbe22aac18b26278d862050fbfee9d1b79 (patch)
treefe7c5ab56326c597ef515b499201c9bb4908517f
parentc836f8ef73c497d733be3cb9d57fc47734f99b0a (diff)
downloadopenssl-new-bb7ccdfbe22aac18b26278d862050fbfee9d1b79.tar.gz
Update from stable branch.
-rw-r--r--crypto/pkcs12/p12_crt.c3
1 files changed, 3 insertions, 0 deletions
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;