Improve schema error messages

[openldap] / servers / slapd / back-meta / search.c

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index 55c05a746d62c78b9b725738e2c3c2b428ba675d..f1b2f698cb4b7c0c94a653cd7dfe8406f095c99f 100644 (file)
--- 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;