From cdcecffd001724cf147934b1d4c84e7e2f4153bd Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 27 May 2014 13:36:27 +0000
Subject: Remove MemCheck_{on,off} that escaped last time around.
---
src/lib/libssl/src/ssl/ssl_ciph.c | 4 ----
src/lib/libssl/ssl_ciph.c | 4 ----
2 files changed, 8 deletions(-)
(limited to 'src')
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index c9485f8194..8b4825f9d3 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1735,7 +1735,6 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
return 0;
}
- MemCheck_off();
comp = malloc(sizeof(SSL_COMP));
if (comp == NULL) {
SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
@@ -1747,17 +1746,14 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
if (ssl_comp_methods &&
sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) {
free(comp);
- MemCheck_on();
SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID);
return (1);
} else if ((ssl_comp_methods == NULL) ||
!sk_SSL_COMP_push(ssl_comp_methods, comp)) {
free(comp);
- MemCheck_on();
SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
return (1);
} else {
- MemCheck_on();
return (0);
}
}
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index c9485f8194..8b4825f9d3 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1735,7 +1735,6 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
return 0;
}
- MemCheck_off();
comp = malloc(sizeof(SSL_COMP));
if (comp == NULL) {
SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
@@ -1747,17 +1746,14 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
if (ssl_comp_methods &&
sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) {
free(comp);
- MemCheck_on();
SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID);
return (1);
} else if ((ssl_comp_methods == NULL) ||
!sk_SSL_COMP_push(ssl_comp_methods, comp)) {
free(comp);
- MemCheck_on();
SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
return (1);
} else {
- MemCheck_on();
return (0);
}
}
--
cgit v1.2.3-55-g6feb