From 437014723c1fdf818014330bd06174be10d2331e Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Mon, 22 Jul 2002 14:24:32 +0000 Subject: [PATCH] fix ITS#1953 --- servers/slapd/back-meta/search.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c index 55c05a746d..f1b2f698cb 100644 --- a/servers/slapd/back-meta/search.c +++ b/servers/slapd/back-meta/search.c @@ -348,7 +348,9 @@ meta_back_search( if ( mapped_filter == NULL ) { mapped_filter = ( char * )mfilter.bv_val; } else { - free( mfilter.bv_val ); + if ( mfilter.bv_val != filterstr->bv_val ) { + free( mfilter.bv_val ); + } } mfilter.bv_val = NULL; mfilter.bv_len = 0; @@ -668,8 +670,10 @@ meta_send_entry( continue; } - if ( ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR ) { + if ( ber_scanf( &ber, "[W]", &attr->a_vals ) == LBER_ERROR + || attr->a_vals == NULL ) { attr->a_vals = &dummy; + } else if ( attr->a_desc == slap_schema.si_ad_objectClass || attr->a_desc == slap_schema.si_ad_structuralObjectClass ) { int i, last; -- 2.39.5