for consistency, always represent UUIDs correctly (ITS#5168; really, a de-normalize...

[openldap] / servers / slapd / sets.c

diff --git a/servers/slapd/sets.c b/servers/slapd/sets.c
index e2943ca4a8ec4f24f3c5c865cab718d4f33eace7..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;
@@ -650,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;