diff options
| author | Matt Caswell <matt@openssl.org> | 2015-03-04 17:49:51 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-05 09:09:57 +0000 |
| commit | 918bb8652969fd53f0c390c1cd909265ed502c7e (patch) | |
| tree | 883afa725e4529a992611b5b02e8b5c784463e99 /crypto/cms/cms_pwri.c | |
| parent | 618be04e407a7800a7198ac87fa5e8cee7c6e10b (diff) | |
Unchecked malloc fixes
Miscellaneous unchecked malloc fixes. Also fixed some mem leaks on error
paths as I spotted them along the way.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/cms/cms_pwri.c')
| -rw-r--r-- | crypto/cms/cms_pwri.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c index 59691904e6..6729930920 100644 --- a/crypto/cms/cms_pwri.c +++ b/crypto/cms/cms_pwri.c @@ -231,6 +231,8 @@ static int kek_unwrap_key(unsigned char *out, size_t *outlen, return 0; } tmp = OPENSSL_malloc(inlen); + if(!tmp) + return 0; /* setup IV by decrypting last two blocks */ if (!EVP_DecryptUpdate(ctx, tmp + inlen - 2 * blocklen, &outl, in + inlen - 2 * blocklen, blocklen * 2) |