From bc3247c8eb23411aa06a89056f623998745a0bb5 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Mon, 26 May 2014 20:20:51 +0000
Subject: Unchecked malloc() return value in SSL_COMP_add_compression_method(),
 in the !OPENSSL_NO_COMP case. Does not affect OpenBSD as we compile the
 opposite code path.

---
 src/lib/libssl/src/ssl/ssl_ciph.c | 4 ++++
 src/lib/libssl/ssl_ciph.c         | 4 ++++
 2 files changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 6b650ccea3..b2a1e93688 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1737,6 +1737,10 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
 
 	MemCheck_off();
 	comp = malloc(sizeof(SSL_COMP));
+	if (comp == NULL) {
+		SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
+		return (1);
+	}
 	comp->id = id;
 	comp->method = cm;
 	load_builtin_compressions();
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 6b650ccea3..b2a1e93688 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1737,6 +1737,10 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
 
 	MemCheck_off();
 	comp = malloc(sizeof(SSL_COMP));
+	if (comp == NULL) {
+		SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
+		return (1);
+	}
 	comp->id = id;
 	comp->method = cm;
 	load_builtin_compressions();
-- 
cgit v1.2.3-55-g6feb