ITS#7797 Fix segfault in slapo-collect

diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index 6bc8fa07a7bd1101b9a53cd128c12d83a4196031..3705f6de6dddfda00311c0246b84b43c7dfcf93c 100644 (file)
--- a/servers/slapd/overlays/collect.c
+++ b/servers/slapd/overlays/collect.c
@@ -401,8 +401,8 @@ collect_response( Operation *op, SlapReply *rs )
                                 * current search result
                                 */
                                if ( vals ) {
-                                       attr_merge( rs->sr_entry, ci->ci_ad[idx], 
-                                               vals, NULL );
+                                       attr_merge_normalize( rs->sr_entry, ci->ci_ad[idx],
+                                               vals, op->o_tmpmemctx );
                                        ber_bvarray_free_x( vals, op->o_tmpmemctx );
                                }
                        }