From 5a11e3875e3be000959fd7e3eb3e3d08de37e35d Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Thu, 19 Feb 2009 02:09:56 +0000 Subject: [PATCH] ITS#5959 --- CHANGES | 1 + servers/slapd/back-meta/search.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index b8a4f183c2..a630ba93c0 100644 --- a/CHANGES +++ b/CHANGES @@ -5,6 +5,7 @@ OpenLDAP 2.4.15 Release (2009/02/19) Fixed slapd corrupt contextCSN (ITS#5947) Fixed slapd syncrepl order to match on add/delete (ITS#5954) Fixed slapd-bdb/hdb behavior with unallocatable shm (ITS#5956) + Fixed slapd-meta with entries with invalid attrs (ITS#5959) Fixed slapo-pcache caching invalid entries (ITS#5927) Fixed slapo-rwm objectClass preservation (ITS#5760) Build Environment 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