ITS#4587: selfwrite access is broken

[openldap] / servers / slapd / attr.c

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index cdfb3a2fe57eb6a11668fe312d7d7b539c8d0265..bb4b4ca6062e464c3d7a54be8088c1340b777b59 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -40,12 +40,33 @@
 
 #include "slap.h"
 
+Attribute *
+attr_alloc( AttributeDescription *ad )
+{
+       Attribute *a = ch_malloc( sizeof(Attribute) );
+
+       a->a_desc = ad;
+       a->a_next = NULL;
+       a->a_flags = 0;
+       a->a_vals = NULL;
+       a->a_nvals = NULL;
+#ifdef LDAP_COMP_MATCH
+       a->a_comp_data = NULL;
+#endif
+
+       return a;
+}
+
 void
 attr_free( Attribute *a )
 {
        if ( a->a_nvals && a->a_nvals != a->a_vals ) {
                ber_bvarray_free( a->a_nvals );
        }
+       /* a_vals may be equal to slap_dummy_bv, a static empty berval;
+        * this is used as a placeholder for attributes that do not carry
+        * values, e.g. when proxying search entries with the "attrsonly"
+        * bit set. */
        if ( a->a_vals != &slap_dummy_bv ) {
                ber_bvarray_free( a->a_vals );
        }
@@ -87,10 +108,10 @@ attr_dup( Attribute *a )
 
        if ( a == NULL) return NULL;
 
-       tmp = ch_malloc( sizeof(Attribute) );
+       tmp = attr_alloc( a->a_desc );
 
        if ( a->a_vals != NULL ) {
-               int i;
+               int     i;
 
                for ( i = 0; !BER_BVISNULL( &a->a_vals[i] ); i++ ) {
                        /* EMPTY */ ;
@@ -105,16 +126,20 @@ attr_dup( Attribute *a )
                BER_BVZERO( &tmp->a_vals[i] );
 
                /* a_nvals must be non null; it may be equal to a_vals */
-               assert( a->a_nvals );
+               assert( a->a_nvals != NULL );
 
                if ( a->a_nvals != a->a_vals ) {
+                       int     j;
+
                        tmp->a_nvals = ch_malloc( (i + 1) * sizeof(struct berval) );
-                       for ( i = 0; !BER_BVISNULL( &a->a_nvals[i] ); i++ ) {
-                               ber_dupbv( &tmp->a_nvals[i], &a->a_nvals[i] );
-                               if ( BER_BVISNULL( &tmp->a_nvals[i] ) ) break;
+                       for ( j = 0; !BER_BVISNULL( &a->a_nvals[j] ); j++ ) {
+                               assert( j < i );
+                               ber_dupbv( &tmp->a_nvals[j], &a->a_nvals[j] );
+                               if ( BER_BVISNULL( &tmp->a_nvals[j] ) ) break;
                                /* FIXME: error? */
                        }
-                       BER_BVZERO( &tmp->a_nvals[i] );
+                       assert( j == i );
+                       BER_BVZERO( &tmp->a_nvals[j] );
 
                } else {
                        tmp->a_nvals = tmp->a_vals;
@@ -124,14 +149,6 @@ attr_dup( Attribute *a )
                tmp->a_vals = NULL;
                tmp->a_nvals = NULL;
        }
-
-       tmp->a_desc = a->a_desc;
-       tmp->a_next = NULL;
-       tmp->a_flags = 0;
-#ifdef LDAP_COMP_MATCH
-       tmp->a_comp_data = NULL;
-#endif
-
        return tmp;
 }
 
@@ -155,7 +172,6 @@ attrs_dup( Attribute *a )
 }
 
 
-
 /*
  * attr_merge - merge the given type and value with the list of
  * attributes in attrs.
@@ -185,15 +201,7 @@ attr_merge(
        }
 
        if ( *a == NULL ) {
-               *a = (Attribute *) ch_malloc( sizeof(Attribute) );
-               (*a)->a_desc = desc;
-               (*a)->a_vals = NULL;
-               (*a)->a_nvals = NULL;
-               (*a)->a_next = NULL;
-               (*a)->a_flags = 0;
-#ifdef LDAP_COMP_MATCH
-               (*a)->a_comp_data = NULL;
-#endif
+               *a = attr_alloc( desc );
        } else {
                /*
                 * FIXME: if the attribute already exists, the presence
@@ -276,15 +284,7 @@ attr_merge_one(
        }
 
        if ( *a == NULL ) {
-               *a = (Attribute *) ch_malloc( sizeof(Attribute) );
-               (*a)->a_desc = desc;
-               (*a)->a_vals = NULL;
-               (*a)->a_nvals = NULL;
-               (*a)->a_next = NULL;
-               (*a)->a_flags = 0;
-#ifdef LDAP_COMP_MATCH
-               (*a)->a_comp_data = NULL;
-#endif
+               *a = attr_alloc( desc );
        }
 
        rc = value_add_one( &(*a)->a_vals, val );