commit 49f5eb9b4141fdd371dba5018ac6c44faad59e63
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue May 12 12:19:09 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Tue May 12 12:19:09 2015 +0200
tree 776edec254a72a0a47693e915f6efa96eb6c56ac
parent db1cc76091805d8312596a86927c2fe8dd5968e6

Better NULL checks in debug

In case we exit early, like before ssl_setup() was called

library/debug.c

diff --git a/library/debug.c b/library/debug.c
index 940a2d2..c71f4df 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -83,7 +83,7 @@
     char str[512];
     int maxlen = sizeof( str ) - 1;
 
-    if( ssl->conf->f_dbg == NULL || level > debug_threshold )
+    if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || level > debug_threshold )
         return;
 
     if( debug_log_mode == MBEDTLS_DEBUG_LOG_RAW )
@@ -105,7 +105,7 @@
     int maxlen = sizeof( str ) - 1;
     size_t idx = 0;
 
-    if( ssl->conf->f_dbg == NULL || level > debug_threshold )
+    if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || level > debug_threshold )
         return;
 
     /*
@@ -134,7 +134,7 @@
     char txt[17];
     size_t i, maxlen = sizeof( str ) - 1, idx = 0;
 
-    if( ssl->conf->f_dbg == NULL || level > debug_threshold )
+    if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || level > debug_threshold )
         return;
 
     if( debug_log_mode == MBEDTLS_DEBUG_LOG_FULL )
@@ -195,7 +195,7 @@
     char str[512];
     int maxlen = sizeof( str ) - 1;
 
-    if( ssl->conf->f_dbg == NULL || level > debug_threshold )
+    if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || level > debug_threshold )
         return;
 
     mbedtls_snprintf( str, maxlen, "%s(X)", text );
@@ -217,7 +217,7 @@
     int j, k, maxlen = sizeof( str ) - 1, zeros = 1;
     size_t i, n, idx = 0;
 
-    if( ssl->conf->f_dbg == NULL || X == NULL || level > debug_threshold )
+    if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || X == NULL || level > debug_threshold )
         return;
 
     for( n = X->n - 1; n > 0; n-- )
@@ -330,7 +330,7 @@
     char str[1024], prefix[64];
     int i = 0, maxlen = sizeof( prefix ) - 1, idx = 0;
 
-    if( ssl->conf->f_dbg == NULL || crt == NULL || level > debug_threshold )
+    if( ssl->conf == NULL || ssl->conf->f_dbg == NULL || crt == NULL || level > debug_threshold )
         return;
 
     if( debug_log_mode == MBEDTLS_DEBUG_LOG_FULL )