Fix slapi_valueset_count() for no value case

[openldap] / servers / slapd / slapi / slapi_utils.c

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 58c8694036c7efe272b8a1fae1803269470827e6..39cd1ed19539dc74407948667628ba43fcb64e15 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2002-2005 The OpenLDAP Foundation.
+ * Copyright 2002-2006 The OpenLDAP Foundation.
  * Portions Copyright 1997,2002-2003 IBM Corporation.
  * All rights reserved.
  *
@@ -1478,77 +1478,7 @@ slapi_filter_free(
 Slapi_Filter *
 slapi_filter_dup( Slapi_Filter *filter )
 {
-       Filter *f;
-
-       f = (Filter *) slapi_ch_malloc( sizeof(Filter) );
-       f->f_next = NULL;
-       f->f_choice = filter->f_choice;
-
-       switch ( f->f_choice ) {
-       case LDAP_FILTER_AND:
-       case LDAP_FILTER_NOT:
-       case LDAP_FILTER_OR: {
-               Filter *pFilter, **ppF;
-
-               for ( pFilter = filter->f_list, ppF = &f->f_list;
-                     pFilter != NULL;
-                     pFilter = pFilter->f_next, ppF = &f->f_next )
-               {
-                       *ppF = slapi_filter_dup( pFilter );
-                       if ( *ppF == NULL )
-                               break;
-               }
-               break;
-       }
-       case LDAP_FILTER_PRESENT:
-               f->f_desc = filter->f_desc;
-               break;
-       case LDAP_FILTER_EQUALITY:
-       case LDAP_FILTER_GE:
-       case LDAP_FILTER_LE:
-       case LDAP_FILTER_APPROX:
-               f->f_ava = (AttributeAssertion *)slapi_ch_malloc( sizeof(AttributeAssertion) );
-               f->f_ava->aa_desc = filter->f_ava->aa_desc;
-               ber_dupbv( &f->f_ava->aa_value, &filter->f_ava->aa_value );
-               break;
-       case LDAP_FILTER_EXT:
-               f->f_mra = (MatchingRuleAssertion *)slapi_ch_malloc( sizeof(MatchingRuleAssertion) );
-               f->f_mra->ma_rule = filter->f_mra->ma_rule;
-               f->f_mra->ma_rule_text = filter->f_mra->ma_rule_text; /* struct copy */
-               f->f_mra->ma_desc = filter->f_mra->ma_desc;
-               f->f_mra->ma_dnattrs = filter->f_mra->ma_dnattrs;
-               ber_dupbv( &f->f_mra->ma_value, &filter->f_mra->ma_value );
-               break;
-       case LDAP_FILTER_SUBSTRINGS: {
-               int i;
-
-               f->f_sub = (SubstringsAssertion *)slapi_ch_malloc( sizeof(SubstringsAssertion) );
-               f->f_sub->sa_desc = filter->f_sub->sa_desc;
-               ber_dupbv( &f->f_sub_initial, &filter->f_sub_initial );
-               if ( filter->f_sub_any != NULL ) {
-                       for ( i = 0; filter->f_sub_any[i].bv_val != NULL; i++ )
-                               ;
-                       f->f_sub_any = (BerVarray)slapi_ch_malloc( (i + 1) * (sizeof(struct berval)) );
-                       for ( i = 0; filter->f_sub_any[i].bv_val != NULL; i++ ) {
-                               ber_dupbv( &f->f_sub_any[i], &filter->f_sub_any[i] );
-                       }
-                       f->f_sub_any[i].bv_val = NULL;
-               } else {
-                       f->f_sub_any = NULL;
-               }
-               ber_dupbv( &f->f_sub_final, &filter->f_sub_final );
-               break;
-       }
-       case SLAPD_FILTER_COMPUTED:
-               f->f_result = filter->f_result;
-               break;
-       default:
-               slapi_ch_free( (void **)&f );
-               f = NULL;
-               break;
-       }
-
-       return f;
+       return filter_dup( filter, NULL );
 }
 
 int 
@@ -2530,9 +2460,9 @@ void slapi_valueset_free(Slapi_ValueSet *vs)
                BerVarray vp = *vs;
 
                ber_bvarray_free( vp );
-               slapi_ch_free( (void **)&vp );
+               vp = NULL;
 
-               *vs = NULL;
+               slapi_ch_free( (void **)&vp );
        }
 }
 
@@ -2602,6 +2532,9 @@ int slapi_valueset_count( const Slapi_ValueSet *vs )
 
        vp = *vs;
 
+       if ( vp == NULL )
+               return 0;
+
        for ( i = 0; vp[i].bv_val != NULL; i++ )
                ;