From: Jonas Maebe <jonas.maebe@elis.ugent.be>
Date: Sun, 8 Dec 2013 17:09:58 +0000 (+0100)
Subject: dev_crypto_cipher: return immediately if allocating cin/cout failed
X-Git-Tag: master-post-reformat~497
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d8513b4abd00b89481cba59dd3d7f81b90a2e747;p=oweals%2Fopenssl.git

dev_crypto_cipher: return immediately if allocating cin/cout failed

Signed-off-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/evp/openbsd_hw.c b/crypto/evp/openbsd_hw.c
index 93ed5d6515..0554019489 100644
--- a/crypto/evp/openbsd_hw.c
+++ b/crypto/evp/openbsd_hw.c
@@ -193,6 +193,8 @@ static int dev_crypto_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
 	    if(((unsigned long)in&3) || cinl != inl)
 		{
 		cin=OPENSSL_malloc(cinl);
+		if (cin == NULL)
+		    return 0;
 		memcpy(cin,in,inl);
 		cryp.src=cin;
 		}
@@ -200,6 +202,12 @@ static int dev_crypto_cipher(EVP_CIPHER_CTX *ctx,unsigned char *out,
 	    if(((unsigned long)out&3) || cinl != inl)
 		{
 		cout=OPENSSL_malloc(cinl);
+		if (cout == NULL)
+		    {
+		    if (cin != NULL)
+			OPENSSL_free(cin);
+		    return 0;
+		    }
 		cryp.dst=cout;
 		}