More for ITS#6892

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index 7114eb90f895527c08fd6af0d03bc4a416b43e8e..af6e6990ecd08c1cf7499299ef39db4c957d2356 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -1304,10 +1304,12 @@ syncprov_matchops( Operation *op, opcookie *opc, int saveit )
                        op2.o_extra = op->o_extra;
                        op2.o_callback = NULL;
                        if (ss->s_flags & PS_FIX_FILTER) {
+                               Filter *f;
                                /* Skip the AND/GE clause that we stuck on in front. We
                                   would lose deletes/mods that happen during the refresh
                                   phase otherwise (ITS#6555) */
-                               op2.ors_filter = ss->s_op->ors_filter->f_and->f_next;
+                               f = ss->s_op->ors_filter->f_and->f_next;
+                               if ( f ) op2.ors_filter = f;
                        }
                        ldap_pvt_thread_mutex_unlock( &ss->s_mutex );
                        rc = test_filter( &op2, e, op2.ors_filter );