Do not return pointers into BerElement we do not own

[openldap] / servers / slapd / dn.c

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index 148d8155e9756adda8cd41f9053395a96af96769..b1168901c001dac8fadb72f57778ef1e983be181 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -20,8 +20,6 @@
 
 #include "lutil.h"
 
-const struct berval slap_empty_bv = { 0, "" };
-
 /*
  * The DN syntax-related functions take advantage of the dn representation
  * handling functions ldap_str2dn/ldap_dn2str.  The latter are not schema-
@@ -241,8 +239,11 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
                        LDAPAVA                 *ava = rdn[ 0 ][ iAVA ];
                        AttributeDescription    *ad;
                        slap_syntax_validate_func *validf = NULL;
+#ifdef SLAP_NVALUES
+                       slap_mr_normalize_func *normf = NULL;
+#endif
                        slap_syntax_transform_func *transf = NULL;
-                       MatchingRule *mr;
+                       MatchingRule *mr = NULL;
                        struct berval           bv = { 0, NULL };
                        int                     do_sort = 0;
 
@@ -266,18 +267,25 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
                        ava->la_attr = ad->ad_cname;
 
                        if( ava->la_flags & LDAP_AVA_BINARY ) {
+                               if( ava->la_value.bv_len == 0 ) {
+                                       /* BER encoding is empty */
+                                       return LDAP_INVALID_SYNTAX;
+                               }
+
                                /* AVA is binary encoded, don't muck with it */
-                               validf = NULL;
-                               transf = NULL;
-                               mr = NULL;
                        } else if( flags & SLAP_LDAPDN_PRETTY ) {
-                               validf = NULL;
                                transf = ad->ad_type->sat_syntax->ssyn_pretty;
-                               mr = NULL;
-                       } else {
+                               if( !transf ) {
+                                       validf = ad->ad_type->sat_syntax->ssyn_validate;
+                               }
+                       } else { /* normalization */
                                validf = ad->ad_type->sat_syntax->ssyn_validate;
-                               transf = ad->ad_type->sat_syntax->ssyn_normalize;
                                mr = ad->ad_type->sat_equality;
+#ifdef SLAP_NVALUES
+                               if( mr ) normf = mr->smr_normalize;
+#else
+                               transf = ad->ad_type->sat_syntax->ssyn_normalize;
+#endif
                        }
 
                        if ( validf ) {
@@ -294,7 +302,11 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
 
                        if ( transf ) {
                                /*
+#ifdef SLAP_NVALUES
+                                * transform value by pretty function
+#else
                                 * transform value by normalize/pretty function
+#endif
                                 *      if value is empty, use empty_bv
                                 */
                                rc = ( *transf )( ad->ad_type->sat_syntax,
@@ -308,6 +320,27 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
                                }
                        }
 
+#ifdef SLAP_NVALUES
+                       if ( normf ) {
+                               /*
+                                * normalize value
+                                *      if value is empty, use empty_bv
+                                */
+                               rc = ( *normf )(
+                                       0,
+                                       ad->ad_type->sat_syntax,
+                                       mr,
+                                       ava->la_value.bv_len
+                                               ? &ava->la_value
+                                               : (struct berval *) &slap_empty_bv,
+                                       &bv );
+                       
+                               if ( rc != LDAP_SUCCESS ) {
+                                       return LDAP_INVALID_SYNTAX;
+                               }
+                       }
+
+#else
                        if( mr && ( mr->smr_usage & SLAP_MR_DN_FOLD ) ) {
                                char *s = bv.bv_val;
 
@@ -317,6 +350,7 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
                                }
                                free( s );
                        }
+#endif
 
                        if( bv.bv_val ) {
                                free( ava->la_value.bv_val );
@@ -330,34 +364,20 @@ LDAPDN_rewrite( LDAPDN *dn, unsigned flags )
        return LDAP_SUCCESS;
 }
 
-/*
- * dn normalize routine
- */
 int
+#ifdef SLAP_NVALUES
 dnNormalize(
-       Syntax *syntax,
-       struct berval *val,
-       struct berval **normalized )
-{
-       struct berval *out;
-       int rc;
-
-       assert( normalized && *normalized == NULL );
-
-       out = ch_malloc( sizeof( struct berval ) );
-       rc = dnNormalize2( syntax, val, out );
-       if ( rc != LDAP_SUCCESS )
-               free( out );
-       else
-               *normalized = out;
-       return rc;
-}
-
-int
-dnNormalize2(
-       Syntax *syntax,
-       struct berval *val,
-       struct berval *out )
+    slap_mask_t use,
+    Syntax *syntax,
+    MatchingRule *mr,
+    struct berval *val,
+    struct berval *out )
+#else
+dnNormalize(
+    Syntax *syntax,
+    struct berval *val,
+    struct berval *out )
+#endif
 {
        assert( val );
        assert( out );
@@ -406,6 +426,7 @@ dnNormalize2(
        return LDAP_SUCCESS;
 }
 
+#if 0
 /*
  * dn "pretty"ing routine
  */
@@ -428,6 +449,7 @@ dnPretty(
                *pretty = out;
        return rc;
 }
+#endif
 
 int
 dnPretty2(