don't segfault if a database doesn't have the suffix

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 01287a0b4f040dd17cfc99dbc327018ba0673c95..754f7ec53f85964012eda768bf6a54c740e002fd 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -1,9 +1,28 @@
+/* ava.c - routines for dealing with attribute value assertions */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
-/* ava.c - routines for dealing with attribute value assertions */
 
 #include "portable.h"
 
@@ -17,20 +36,22 @@
 
 void
 ava_free(
-    AttributeAssertion *ava,
-    int        freeit
+       Operation *op,
+       AttributeAssertion *ava,
+       int     freeit
 )
 {
-       free( ava->aa_value.bv_val );
+       op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx );
        if ( freeit ) {
-               ch_free( (char *) ava );
+               op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
        }
 }
 
 int
 get_ava(
-    BerElement *ber,
-    AttributeAssertion **ava,
+       Operation *op,
+       BerElement      *ber,
+       AttributeAssertion      **ava,
        unsigned usage,
        const char **text
 )
@@ -52,22 +73,37 @@ get_ava(
                return SLAPD_DISCONNECT;
        }
 
-       aa = ch_malloc( sizeof( AttributeAssertion ) );
+       aa = op->o_tmpalloc( sizeof( AttributeAssertion ), op->o_tmpmemctx );
        aa->aa_desc = NULL;
        aa->aa_value.bv_val = NULL;
 
        rc = slap_bv2ad( &type, &aa->aa_desc, text );
 
        if( rc != LDAP_SUCCESS ) {
-               ch_free( aa );
+#ifdef NEW_LOGGING
+               LDAP_LOG( FILTER, ERR,
+               "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_FILTER,
+               "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
+#endif
+               op->o_tmpfree( aa, op->o_tmpmemctx );
                return rc;
        }
 
-       rc = value_validate_normalize( aa->aa_desc, usage,
-               &value, &aa->aa_value, text );
+       rc = asserted_value_validate_normalize(
+               aa->aa_desc, ad_mr(aa->aa_desc, usage),
+               usage, &value, &aa->aa_value, text, op->o_tmpmemctx );
 
        if( rc != LDAP_SUCCESS ) {
-               ch_free( aa );
+#ifdef NEW_LOGGING
+               LDAP_LOG( FILTER, ERR,
+               "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
+#else
+               Debug( LDAP_DEBUG_FILTER,
+               "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
+#endif
+               op->o_tmpfree( aa, op->o_tmpmemctx );
                return rc;
        }