From a1eeaba0b141f782b4d5f22f4c8ad19671042d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Kuzn=C3=ADk?= <ondra@mistotebe.net>
Date: Tue, 23 Sep 2014 21:05:08 +0100
Subject: [PATCH] ITS#7797 Fix segfault in slapo-collect
---
servers/slapd/overlays/collect.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/servers/slapd/overlays/collect.c b/servers/slapd/overlays/collect.c
index 6bc8fa07a7..3705f6de6d 100644
--- 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 );
}
}
--
GitLab