Fix ITS#1843, don't deref NULL string in ldap_pvt_str2upper

[openldap] / libraries / libldap / sbind.c

diff --git a/libraries/libldap/sbind.c b/libraries/libldap/sbind.c
index baa7ac8c59eaf9e45306057f55f2c9d39039026d..eb8aaed4bd57f564e125b6011efa549c53f713cd 100644 (file)
--- a/libraries/libldap/sbind.c
+++ b/libraries/libldap/sbind.c
@@ -62,7 +62,11 @@ ldap_simple_bind(
        int msgid;
        struct berval cred;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "sbind", LDAP_LEVEL_ENTRY, "ldap_simple_bind\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind\n", 0, 0, 0 );
+#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
@@ -97,7 +101,11 @@ ldap_simple_bind_s( LDAP *ld, LDAP_CONST char *dn, LDAP_CONST char *passwd )
 {
        struct berval cred;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "sbind", LDAP_LEVEL_ENTRY, "ldap_simple_bind_s\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_simple_bind_s\n", 0, 0, 0 );
+#endif
 
        if ( passwd != NULL ) {
                cred.bv_val = (char *) passwd;