ITS#5959

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

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; i<last; i++ ) {
-				attr->a_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] );