Partial revert from 1.246, not sure what's the point

[openldap] / servers / slapd / sets.c

diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c
index 4583350980a54afe6e5d54af33bd12bb053d2211..3393e83bf3c3a17df4b1ce645615b23b99a7e63d 100644 (file)
--- a/servers/slapd/sets.c
+++ b/servers/slapd/sets.c
@@ -182,6 +182,9 @@ slap_set_join(
                                }
                        }
 
+                       /* pointers to values have been used in set - don't free twice */
+                       op_flags |= SLAP_SET_LREFVAL;
+
                        last = i;
 
                        for ( i = 0; !BER_BVISNULL( &rset[ i ] ); i++ ) {
@@ -210,6 +213,10 @@ slap_set_join(
                                        last++;
                                }
                        }
+
+                       /* pointers to values have been used in set - don't free twice */
+                       op_flags |= SLAP_SET_RREFVAL;
+
                        BER_BVZERO( &set[ last ] );
                }
                break;
@@ -268,6 +275,27 @@ slap_set_join(
                i = slap_set_size( rset );
                j = slap_set_size( lset );
 
+               /* handle empty set cases */
+               if ( i == 0 ) {
+                       if ( j == 0 ) {
+                               set = cp->set_op->o_tmpcalloc( i * j + 1, sizeof( struct berval ),
+                                               cp->set_op->o_tmpmemctx );
+                               if ( set == NULL ) {
+                                       break;
+                               }
+                               BER_BVZERO( &set[ 0 ] );
+                               break;
+
+                       } else {
+                               set = set_dup( cp, lset, SLAP_SET_LREF2REF( op_flags ) );
+                               break;
+                       }
+
+               } else if ( j == 0 ) {
+                       set = set_dup( cp, rset, SLAP_SET_RREF2REF( op_flags ) );
+                       break;
+               }
+
                set = cp->set_op->o_tmpcalloc( i * j + 1, sizeof( struct berval ),
                                cp->set_op->o_tmpmemctx );
                if ( set == NULL ) {
@@ -279,17 +307,36 @@ slap_set_join(
                                struct berval   bv;
                                long            k;
 
-                               bv.bv_len = lset[ i ].bv_len + rset[ j ].bv_len;
-                               bv.bv_val = cp->set_op->o_tmpalloc( bv.bv_len + 1,
-                                               cp->set_op->o_tmpmemctx );
-                               if ( bv.bv_val == NULL ) {
-                                       ber_bvarray_free_x( set, cp->set_op->o_tmpmemctx );
-                                       set = NULL;
-                                       goto done;
+                               /* don't concatenate with the empty string */
+                               if ( BER_BVISEMPTY( &lset[ i ] ) ) {
+                                       ber_dupbv_x( &bv, &rset[ j ], cp->set_op->o_tmpmemctx );
+                                       if ( bv.bv_val == NULL ) {
+                                               ber_bvarray_free_x( set, cp->set_op->o_tmpmemctx );
+                                               set = NULL;
+                                               goto done;
+                                       }
+
+                               } else if ( BER_BVISEMPTY( &rset[ j ] ) ) {
+                                       ber_dupbv_x( &bv, &lset[ i ], cp->set_op->o_tmpmemctx );
+                                       if ( bv.bv_val == NULL ) {
+                                               ber_bvarray_free_x( set, cp->set_op->o_tmpmemctx );
+                                               set = NULL;
+                                               goto done;
+                                       }
+
+                               } else {
+                                       bv.bv_len = lset[ i ].bv_len + rset[ j ].bv_len;
+                                       bv.bv_val = cp->set_op->o_tmpalloc( bv.bv_len + 1,
+                                                       cp->set_op->o_tmpmemctx );
+                                       if ( bv.bv_val == NULL ) {
+                                               ber_bvarray_free_x( set, cp->set_op->o_tmpmemctx );
+                                               set = NULL;
+                                               goto done;
+                                       }
+                                       AC_MEMCPY( bv.bv_val, lset[ i ].bv_val, lset[ i ].bv_len );
+                                       AC_MEMCPY( &bv.bv_val[ lset[ i ].bv_len ], rset[ j ].bv_val, rset[ j ].bv_len );
+                                       bv.bv_val[ bv.bv_len ] = '\0';
                                }
-                               AC_MEMCPY( bv.bv_val, lset[ i ].bv_val, lset[ i ].bv_len );
-                               AC_MEMCPY( &bv.bv_val[ lset[ i ].bv_len ], rset[ j ].bv_val, rset[ j ].bv_len );
-                               bv.bv_val[ bv.bv_len ] = '\0';
 
                                for ( k = 0; k < last; k++ ) {
                                        if ( bvmatch( &set[ k ], &bv ) ) {
@@ -610,27 +657,33 @@ slap_set_filter( SLAP_SET_GATHER gatherer,
 
                case '-':
                        if ( ( SF_TOP() == (void *)'/' )
-                                       && ( *filter >= '0' || *filter <= '9' ) )
+                               && ( *filter == '*' || ASCII_DIGIT( *filter ) ) )
                        {
-                               int parent = 0;
-                               int count = 1;
-                               int i;
-                               for ( len = 1;
-                                               ( c = filter[ len ] )
-                                                       && ( c >= '0' && c <= '9' );
-                                               len++ )
-                                       /* count */ ;
-                               for ( i = len ; i > 0 ; i-- ) {
-                                       parent += (int)( filter[ i - 1 ] - '0' ) * count;
-                                       count *= 10;
-                               }
                                SF_POP();
-                               if ( parent == 0 ) {
+
+                               if ( *filter == '*' ) {
                                        set = set_parents( cp, SF_POP() );
+                                       filter++;
+
                                } else {
-                                       set = set_parent( cp, SF_POP(), parent );
+                                       char *next = NULL;
+                                       long parent = strtol( filter, &next, 10 );
+
+                                       if ( next == filter ) {
+                                               SF_ERROR( syntax );
+                                       }
+
+                                       set = SF_POP();
+                                       if ( parent != 0 ) {
+                                               set = set_parent( cp, set, parent );
+                                       }
+                                       filter = next;
                                }
-                               filter += len;
+
+                               if ( set == NULL ) {
+                                       SF_ERROR( memory );
+                               }
+
                                SF_PUSH( set );
                                set = NULL;
                                break;