Add some additional error checking...

but haven't yet figured out why NVALUES crashes in test003

diff --git a/servers/slapd/filter.c b/servers/slapd/filter.c
index cbb0389cc62ecfea4a6296911cd978c5d06a3039..f8f2d121d30348f03f3e33ac48acf655b8a5b040 100644 (file)
--- a/servers/slapd/filter.c
+++ b/servers/slapd/filter.c
@@ -124,6 +124,10 @@ get_filter(
                Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
 #endif
                err = get_substring_filter( conn, ber, f, text );
+               if( err != LDAP_SUCCESS ) {
+                       break;
+               }
+               assert( f->f_sub != NULL );
                break;
 
        case LDAP_FILTER_GE:
@@ -137,6 +141,7 @@ get_filter(
                if ( err != LDAP_SUCCESS ) {
                        break;
                }
+               assert( f->f_ava != NULL );
                break;
 
        case LDAP_FILTER_LE:
@@ -150,6 +155,7 @@ get_filter(
                if ( err != LDAP_SUCCESS ) {
                        break;
                }
+               assert( f->f_ava != NULL );
                break;
 
        case LDAP_FILTER_PRESENT: {
@@ -190,6 +196,7 @@ get_filter(
                if ( err != LDAP_SUCCESS ) {
                        break;
                }
+               assert( f->f_ava != NULL );
                break;
 
        case LDAP_FILTER_AND:
@@ -203,6 +210,7 @@ get_filter(
                if ( err != LDAP_SUCCESS ) {
                        break;
                }
+               assert( f->f_and != NULL );
                break;
 
        case LDAP_FILTER_OR:
@@ -216,6 +224,7 @@ get_filter(
                if ( err != LDAP_SUCCESS ) {
                        break;
                }
+               assert( f->f_or != NULL );
                break;
 
        case LDAP_FILTER_NOT:
@@ -230,6 +239,7 @@ get_filter(
                if ( err != LDAP_SUCCESS ) {
                        break;
                }
+               assert( f->f_not != NULL );
                break;
 
        case LDAP_FILTER_EXT: