From: Jonas Maebe <jonas.maebe@elis.ugent.be>
Date: Mon, 2 Dec 2013 21:07:02 +0000 (+0100)
Subject: SSL_COMP_add_compression_method: exit if allocating the new compression method struct... 
X-Git-Tag: master-post-reformat~175
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=d00b1d62d62036dc21c78658a28da4a6279e6fe2

SSL_COMP_add_compression_method: exit if allocating the new compression method struct fails

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 1599d7971c..133d9d9b2f 100644
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1962,6 +1962,13 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
 
 	MemCheck_off();
 	comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
+	if (comp == NULL)
+		{
+		MemCheck_on();
+		SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,ERR_R_MALLOC_FAILURE);
+		return(1);
+		}
+
 	comp->id=id;
 	comp->method=cm;
 	load_builtin_compressions();