summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authormiod <>2014-05-26 20:20:51 +0000
committermiod <>2014-05-26 20:20:51 +0000
commitbc3247c8eb23411aa06a89056f623998745a0bb5 (patch)
treedd8e7e5e809f2a92779e0ac61316dbc90e71614b /src
parent1177905d01a7463e765feac142139825d6d44c73 (diff)
downloadopenbsd-bc3247c8eb23411aa06a89056f623998745a0bb5.tar.gz
openbsd-bc3247c8eb23411aa06a89056f623998745a0bb5.tar.bz2
openbsd-bc3247c8eb23411aa06a89056f623998745a0bb5.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/ssl_ciph.c4
-rw-r--r--src/lib/libssl/ssl_ciph.c4
2 files changed, 8 insertions, 0 deletions
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)
1737 1737
1738 MemCheck_off(); 1738 MemCheck_off();
1739 comp = malloc(sizeof(SSL_COMP)); 1739 comp = malloc(sizeof(SSL_COMP));
1740 if (comp == NULL) {
1741 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
1742 return (1);
1743 }
1740 comp->id = id; 1744 comp->id = id;
1741 comp->method = cm; 1745 comp->method = cm;
1742 load_builtin_compressions(); 1746 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)
1737 1737
1738 MemCheck_off(); 1738 MemCheck_off();
1739 comp = malloc(sizeof(SSL_COMP)); 1739 comp = malloc(sizeof(SSL_COMP));
1740 if (comp == NULL) {
1741 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
1742 return (1);
1743 }
1740 comp->id = id; 1744 comp->id = id;
1741 comp->method = cm; 1745 comp->method = cm;
1742 load_builtin_compressions(); 1746 load_builtin_compressions();