projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update from stable branch.
[openssl.git]
/
crypto
/
pkcs12
/
p12_crt.c
diff --git
a/crypto/pkcs12/p12_crt.c
b/crypto/pkcs12/p12_crt.c
index acac2167391dec53b61bf72d95122e6b1a4a5eed..96b131defa0cadb3df00e170698913c5952257f2 100644
(file)
--- 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;