Improve error detection when streaming S/MIME.

[openssl.git] / crypto / pkcs7 / bio_pk7.c

diff --git a/crypto/pkcs7/bio_pk7.c b/crypto/pkcs7/bio_pk7.c
index 533e596a1c394ee5ed6df73ce37c02000e37a4bf..581ba09f7aab831826d8cfe986216f4495535fbd 100644 (file)
--- a/crypto/pkcs7/bio_pk7.c
+++ b/crypto/pkcs7/bio_pk7.c
@@ -114,13 +114,17 @@ BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7)
 
        out = BIO_push(asn_bio, out);
 
+       if (!p7aux || !asn_bio || !out)
+               goto err;
+
        BIO_asn1_set_prefix(asn_bio, pkcs7_prefix, pkcs7_prefix_free);
        BIO_asn1_set_suffix(asn_bio, pkcs7_suffix, pkcs7_suffix_free);
 
        /* Now initialize BIO for PKCS#7 output */
 
        p7bio = PKCS7_dataInit(p7, out);
-       PKCS7_stream(&boundary, p7);
+       if (!p7bio || !PKCS7_stream(&boundary, p7))
+               goto err;
 
        p7aux->p7 = p7;
        p7aux->p7bio = p7bio;
@@ -131,6 +135,14 @@ BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7)
 
        return p7bio;
 
+       err:
+       if (p7bio)
+               BIO_free(p7bio);
+       if (asn_bio)
+               BIO_free(asn_bio);
+       if (p7aux)
+               OPENSSL_free(p7aux);
+       return NULL;
        }
 
 static int pkcs7_prefix(BIO *b, unsigned char **pbuf, int *plen, void *parg)