fix substring_comp_candidates logic if intersection of candidates

is ever empty.  See ITS#228.

diff --git a/servers/slapd/back-bdb2/filterindex.c b/servers/slapd/back-bdb2/filterindex.c
index d5cc90d95fdcc3626fb587581593e1a7ce53aba4..32da1d85e7935f0d24e30b9948a4f5569ada0268 100644 (file)
--- a/servers/slapd/back-bdb2/filterindex.c
+++ b/servers/slapd/back-bdb2/filterindex.c
@@ -345,6 +345,11 @@ substring_comp_candidates(
                        bdb2i_idl_free( tmp );
                        bdb2i_idl_free( tmp2 );
                }
+
+               /* break if no candidates */
+               if( idl == NULL ) {
+                       break;
+               }
        }
 
        Debug( LDAP_DEBUG_TRACE, "<= substring_comp_candidates %ld\n",

diff --git a/servers/slapd/back-ldbm/filterindex.c b/servers/slapd/back-ldbm/filterindex.c
index 2c32d50d9fe734ee4000a84b8577dd7a62100f0b..65842a34633393bfd4ee3b5a92c3a134464b7a67 100644 (file)
--- a/servers/slapd/back-ldbm/filterindex.c
+++ b/servers/slapd/back-ldbm/filterindex.c
@@ -345,6 +345,11 @@ substring_comp_candidates(
                        idl_free( tmp );
                        idl_free( tmp2 );
                }
+
+               /* break if no candidates */
+               if( idl == NULL ) {
+                       break;
+               }
        }
 
        Debug( LDAP_DEBUG_TRACE, "<= substring_comp_candidates %ld\n",