--- servers/slapd/filter.c	2000/05/16 14:22:52	1.32
+++ servers/slapd/filter.c	2000/05/16 19:44:54	1.35
@@ -1,5 +1,5 @@
 /* filter.c - routines for parsing and dealing with filters */
-/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.31 2000/05/15 21:47:51 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/filter.c,v 1.34 2000/05/16 19:03:18 kurt Exp $ */
 /*
  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -94,11 +94,12 @@ get_filter(
 	case LDAP_FILTER_EQUALITY:
 		Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
 
-		if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) {
-			*text = "error decoding filter";
+		if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {
 			break;
 		}
 
+		assert( f->f_ava != NULL );
+
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
 		*fstr = ch_malloc( sizeof("(=)")
 			+ f->f_av_desc->ad_cname->bv_len
@@ -125,8 +126,7 @@ get_filter(
 	case LDAP_FILTER_GE:
 		Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
 
-		if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) {
-			*text = "decoding filter error";
+		if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {
 			break;
 		}
 
@@ -151,8 +151,7 @@ get_filter(
 	case LDAP_FILTER_LE:
 		Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
 
-		if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) {
-			*text = "decoding filter error";
+		if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {
 			break;
 		}
 
@@ -218,8 +217,7 @@ get_filter(
 	case LDAP_FILTER_APPROX:
 		Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
 
-		if ( (err = get_ava( ber, &f->f_ava )) != LDAP_SUCCESS ) {
-			*text = "decoding filter error";
+		if ( (err = get_ava( ber, &f->f_ava, text )) != LDAP_SUCCESS ) {
 			break;
 		}
 
@@ -374,6 +372,7 @@ get_substring_filter(
 	}
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
+	f->f_sub_desc = NULL;
 	rc = slap_bv2ad( &type, &f->f_sub_desc, text );
 
 	ch_free( type.bv_val );