From 4e09f864a946ffb6530853f5d956b91a27f66a2a Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 19 Feb 2009 02:05:28 +0000 Subject: [PATCH] ITS#5959 drop attrs with illegal values --- servers/slapd/back-meta/search.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c index 27bac0e438..4c52831e23 100644 --- a/servers/slapd/back-meta/search.c +++ b/servers/slapd/back-meta/search.c @@ -2080,12 +2080,17 @@ remove_oc:; attr->a_nvals = ch_malloc( ( last + 1 ) * sizeof( struct berval ) ); for ( i = 0; ia_desc->ad_type->sat_equality->smr_normalize( + /* if normalizer fails, forget this attr */ + if ( attr->a_desc->ad_type->sat_equality->smr_normalize( SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX, attr->a_desc->ad_type->sat_syntax, attr->a_desc->ad_type->sat_equality, &attr->a_vals[i], &attr->a_nvals[i], - NULL ); + NULL )) { + BER_BVZERO( &attr->a_nvals[i] ); + attr_free( attr ); + goto next_attr; + } } BER_BVZERO( &attr->a_nvals[i] ); -- 2.39.5