[openssl-commits] [openssl] master update

[Viktor Dukhovni]

The branch master has been updated
       via  d1b105827aef49ae16fd2d321bafa92b1a6489c9 (commit)
      from  48cc4ad020213c83c34b225820522fe64163b522 (commit)


- Log -----------------------------------------------------------------
commit d1b105827aef49ae16fd2d321bafa92b1a6489c9
Author: Viktor Dukhovni <openssl-users at dukhovni.org>
Date:   Sat Feb 6 15:17:11 2016 -0500

    Allocate bio_err before turning on memleak checks
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 test/danetest.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/danetest.c b/test/danetest.c
index 92a3b1b..cad751f 100644
--- a/test/danetest.c
+++ b/test/danetest.c
@@ -471,6 +471,8 @@ int main(int argc, char *argv[])
     CAfile = argv[2];
     tlsafile = argv[3];
 
+    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
+
     p = getenv("OPENSSL_DEBUG_MEMORY");
     if (p != NULL && strcmp(p, "on") == 0)
         CRYPTO_set_mem_debug(1);
@@ -483,8 +485,6 @@ int main(int argc, char *argv[])
         return 0;
     }
 
-    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);
-
     SSL_library_init();
     SSL_load_error_strings();