ITS#5747: Only use C99 flexible array member when supported

[openldap] / servers / slapd / overlays / dynlist.c

diff --git a/servers/slapd/overlays/dynlist.c b/servers/slapd/overlays/dynlist.c
index 71c0eb0b3a3666393b142c0ddf6ad4723e8de532..b7f38aa01dd7f058b26d56b69f3638ab5b575d03 100644 (file)
--- a/servers/slapd/overlays/dynlist.c
+++ b/servers/slapd/overlays/dynlist.c
@@ -579,7 +579,7 @@ cleanup:;
                        slap_op_groups_free( &o );
                }
                if ( o.ors_filter ) {
-                       filter_free_x( &o, o.ors_filter );
+                       filter_free_x( &o, o.ors_filter, 1 );
                }
                if ( o.ors_attrs && o.ors_attrs != rs->sr_attrs
                                && o.ors_attrs != slap_anlist_no_attrs )
@@ -877,7 +877,7 @@ dynlist_build_def_filter( dynlist_info_t *dli )
        ptr = lutil_strcopy( ptr, dli->dli_oc->soc_cname.bv_val );
        ptr = lutil_strcopy( ptr, "))" );
 
-       assert( dli->dli_default_filter.bv_len == ptr - dli->dli_default_filter.bv_val );
+       assert( ptr == &dli->dli_default_filter.bv_val[dli->dli_default_filter.bv_len] );
 
        return 0;
 }