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

[openldap] / libraries / libldap / compare.c

diff --git a/libraries/libldap/compare.c b/libraries/libldap/compare.c
index a48dda120f335884d2fe9494fac39122e6656991..4af59d01b8d15842a6a5f44db0244028d1a04c66 100644 (file)
--- a/libraries/libldap/compare.c
+++ b/libraries/libldap/compare.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -36,7 +36,7 @@
  * attr and value) are supplied.  The msgid of the response is returned.
  *
  * Example:
- *     struct berval bvalue = { "secret", strlen("secret") };
+ *     struct berval bvalue = { "secret", sizeof("secret")-1 };
  *     rc = ldap_compare( ld, "c=us@cn=bob",
  *             "userPassword", &bvalue,
  *             sctrl, cctrl, &msgid )
@@ -51,9 +51,14 @@ ldap_compare_ext(
        LDAPControl **cctrls,
        int     *msgidp )
 {
+       int rc;
        BerElement      *ber;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG (( "compare", LDAP_LEVEL_ENTRY, "ldap_compare\n" ));
+#else
        Debug( LDAP_DEBUG_TRACE, "ldap_compare\n", 0, 0, 0 );
+#endif
 
        assert( ld != NULL );
        assert( LDAP_VALID( ld ) );
@@ -61,6 +66,10 @@ ldap_compare_ext(
        assert( attr != NULL );
        assert( msgidp != NULL );
 
+       /* check client controls */
+       rc = ldap_int_client_controls( ld, cctrls );
+       if( rc != LDAP_SUCCESS ) return rc;
+
        /* create a message to send */
        if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
                return( LDAP_NO_MEMORY );
@@ -122,6 +131,8 @@ ldap_compare(
        int msgid;
        struct berval bvalue;
 
+       assert( value != NULL );
+
        bvalue.bv_val = (char *) value;
        bvalue.bv_len = (value == NULL) ? 0 : strlen( value );
 
@@ -162,6 +173,8 @@ ldap_compare_s(
 {
        struct berval bvalue;
 
+       assert( value != NULL );
+
        bvalue.bv_val = (char *) value;
        bvalue.bv_len = (value == NULL) ? 0 : strlen( value );