Update from stable branch.
authorDr. Stephen Henson <steve@openssl.org>
Mon, 9 Mar 2009 13:08:04 +0000 (13:08 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 9 Mar 2009 13:08:04 +0000 (13:08 +0000)
crypto/pkcs12/p12_crt.c

index acac216..96b131d 100644 (file)
@@ -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;