summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2014-05-27 13:36:28 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2014-05-27 13:36:28 +0000
commit0d9f1a71de8ad905682295a910f1f0497147475d (patch)
treedd5bcd9942eb5e8c67b75ff9b98eed5d0e1aeeda /lib
parent571bc48f0975d86e9ecd80ffc1e8a693e5648909 (diff)
Remove MemCheck_{on,off} that escaped last time around.
Diffstat (limited to 'lib')
-rw-r--r--lib/libssl/ssl_ciph.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/libssl/ssl_ciph.c b/lib/libssl/ssl_ciph.c
index c9485f81947..8b4825f9d3b 100644
--- a/lib/libssl/ssl_ciph.c
+++ b/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);
}
}