Commit 541e9565 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

If memory debugging enabled return error on leaks. 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent cc5a9ba4

apps/openssl.c

+2 −1
Original line number Diff line number Diff line
@@ -429,7 +429,8 @@ int main(int argc, char *argv[]) 
    BIO_free_all(bio_out);

    apps_shutdown();

#ifndef OPENSSL_NO_CRYPTO_MDEBUG

    CRYPTO_mem_leaks(bio_err);

    if (CRYPTO_mem_leaks(bio_err) <= 0)

        ret = 1;

#endif

    BIO_free(bio_err);

    EXIT(ret);

test/clienthellotest.c

+2 −1
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ int main(int argc, char *argv[]) 
    EVP_cleanup();

    CRYPTO_cleanup_all_ex_data();

#ifndef OPENSSL_NO_CRYPTO_MDEBUG

    CRYPTO_mem_leaks(err);

    if (CRYPTO_mem_leaks(err) <= 0)

        testresult = 0;

#endif

    BIO_free(err);

test/danetest.c

+2 −1
Original line number Diff line number Diff line
@@ -526,7 +526,8 @@ end: 
    ERR_remove_thread_state(NULL);

    EVP_cleanup();

#ifndef OPENSSL_NO_CRYPTO_MDEBUG

    CRYPTO_mem_leaks(bio_err);

    if (CRYPTO_mem_leaks(bio_err) <= 0)

        ret = 1;

#endif

    BIO_free(bio_err);

    EXIT(ret);

test/dsatest.c

+2 −1
Original line number Diff line number Diff line
@@ -215,7 +215,8 @@ int main(int argc, char **argv) 
    ERR_remove_thread_state(NULL);

    ERR_free_strings();

#ifndef OPENSSL_NO_CRYPTO_MDEBUG

    CRYPTO_mem_leaks(bio_err);

    if (CRYPTO_mem_leaks(bio_err) <= 0)

        ret = 0;

#endif

    BIO_free(bio_err);

    bio_err = NULL;

test/ecdhtest.c

+2 −1
Original line number Diff line number Diff line
@@ -516,7 +516,8 @@ int main(int argc, char *argv[]) 
    CRYPTO_cleanup_all_ex_data();

    ERR_remove_thread_state(NULL);

#ifndef OPENSSL_NO_CRYPTO_MDEBUG

    CRYPTO_mem_leaks_fp(stderr);

    if (CRYPTO_mem_leaks_fp(stderr) <= 0)

        ret = 1;

#endif

    EXIT(ret);

}