From 99fe30b32672553e1dafc523c00080950c92f93c Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Wed, 29 Apr 2009 11:31:39 +0000 Subject: [PATCH] (nearly blind) fix for NULL in TLS error message (ITS#6079) --- libraries/libldap/ldap-int.h | 4 ++++ libraries/libldap/tls2.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h index c4d1d3073c..48b6ccd298 100644 --- a/libraries/libldap/ldap-int.h +++ b/libraries/libldap/ldap-int.h @@ -75,6 +75,9 @@ #ifdef LDAP_DEBUG +#define DebugTest( level ) \ + ( ldap_debug & level ) + #define Debug( level, fmt, arg1, arg2, arg3 ) \ do { if ( ldap_debug & level ) \ ldap_log_printf( NULL, (level), (fmt), (arg1), (arg2), (arg3) ); \ @@ -85,6 +88,7 @@ #else +#define DebugTest( level ) (0 == 1) #define Debug( level, fmt, arg1, arg2, arg3 ) ((void)0) #define LDAP_Debug( subsystem, level, fmt, arg1, arg2, arg3 ) ((void)0) diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c index 642cc118eb..851ffdad51 100644 --- a/libraries/libldap/tls2.c +++ b/libraries/libldap/tls2.c @@ -434,11 +434,14 @@ ldap_pvt_tls_accept( Sockbuf *sb, void *ctx_arg ) if ( err < 0 ) { - char buf[256]; if ( update_flags( sb, ssl, err )) return 1; - Debug( LDAP_DEBUG_ANY,"TLS: can't accept: %s.\n", - tls_imp->ti_session_errmsg( err, buf, sizeof(buf) ),0,0 ); + if ( DebugTest( LDAP_DEBUG_ANY ) ) { + char buf[256], *msg; + msg = tls_imp->ti_session_errmsg( err, buf, sizeof(buf) ); + Debug( LDAP_DEBUG_ANY,"TLS: can't accept: %s.\n", + msg ? msg : "(unknown)", 0, 0 ); + } ber_sockbuf_remove_io( sb, tls_imp->ti_sbio, LBER_SBIOD_LEVEL_TRANSPORT ); -- 2.39.5