From: Richard Levitte <levitte@openssl.org>
Date: Mon, 1 Dec 2003 12:11:55 +0000 (+0000)
Subject: Check that OPENSSL_malloc() really returned some memory.
X-Git-Tag: BEN_FIPS_TEST_5~13^2~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1145e03870dd82eae00bb45e0b2162494b9b2f38;p=oweals%2Fopenssl.git

Check that OPENSSL_malloc() really returned some memory.

PR: 751
Notified by: meder@mcs.anl.gov
Reviewed by: Lutz Jaenicke, Richard Levitte
---

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index db621bfc8b..658391105c 100644
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -149,6 +149,11 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
 
 		ctx->cipher=cipher;
 		ctx->cipher_data=OPENSSL_malloc(ctx->cipher->ctx_size);
+		if (!ctx->cipher_data)
+			{
+			EVPerr(EVP_F_EVP_CIPHERINIT, ERR_R_MALLOC_FAILURE);
+			return 0;
+			}
 		ctx->key_len = cipher->key_len;
 		ctx->flags = 0;
 		if(ctx->cipher->flags & EVP_CIPH_CTRL_INIT)