diff options
| author | Matt Caswell <matt@openssl.org> | 2015-11-04 15:51:02 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-11-09 23:00:37 +0000 |
| commit | 84d0c40f3fbcb9e3067cbbc2f01bd965e587c178 (patch) | |
| tree | 07f9867b101ff4fab398604749f8a9d807fc7c73 /crypto/pkcs7 | |
| parent | c8cc43108d97517dfce25a114acd5651f5548cd5 (diff) | |
| download | openssl-84d0c40f3fbcb9e3067cbbc2f01bd965e587c178.tar.gz | |
Fix missing malloc return value checks
During work on a larger change in master a number of locations were
identified where return value checks were missing. This backports the
relevant fixes.
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 903738ac63e60c10552741e2d6de9753c67e0ff3)
Conflicts:
crypto/cms/cms_sd.c
Diffstat (limited to 'crypto/pkcs7')
| -rw-r--r-- | crypto/pkcs7/pk7_doit.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/pkcs7/pk7_doit.c b/crypto/pkcs7/pk7_doit.c index 83f3b77b29..946aaa6543 100644 --- a/crypto/pkcs7/pk7_doit.c +++ b/crypto/pkcs7/pk7_doit.c @@ -656,6 +656,8 @@ BIO *PKCS7_dataDecode(PKCS7 *p7, EVP_PKEY *pkey, BIO *in_bio, X509 *pcert) bio = BIO_new_mem_buf(data_body->data, data_body->length); else { bio = BIO_new(BIO_s_mem()); + if (bio == NULL) + goto err; BIO_set_mem_eof_return(bio, 0); } if (bio == NULL) |