Turn off memory checking when loading new compression algorithms.

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index f63163f26c38cfd1964194803e67b0c51c4a04ee..52a2c7f3d32ff661b0f03456da2d8a0304e0dd76 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -1053,6 +1053,7 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
        SSL_COMP *comp;
        STACK_OF(SSL_COMP) *sk;
 
        SSL_COMP *comp;
        STACK_OF(SSL_COMP) *sk;
 

+       MemCheck_off();

        comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
        comp->id=id;
        comp->method=cm;
        comp=(SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
        comp->id=id;
        comp->method=cm;


@@ -1062,10 +1063,13 @@ int SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
                sk=ssl_comp_methods;
        if ((sk == NULL) || !sk_SSL_COMP_push(sk,comp))
                {
                sk=ssl_comp_methods;
        if ((sk == NULL) || !sk_SSL_COMP_push(sk,comp))
                {

+               MemCheck_on();

                SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,ERR_R_MALLOC_FAILURE);
                return(0);
                }
        else
                SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,ERR_R_MALLOC_FAILURE);
                return(0);
                }
        else

+               {
+               MemCheck_on();

                return(1);
                return(1);

+               }

        }
        }

-