Fix crasher in attr_merge_normalize_one()

diff --git a/servers/slapd/attr.c b/servers/slapd/attr.c
index d1023d96231ce053d6176a926cfe5cc7219bba0c..3c5f77d60155d2aa262de8776c7939e7c756397c 100644 (file)
--- a/servers/slapd/attr.c
+++ b/servers/slapd/attr.c
@@ -230,6 +230,7 @@ attr_merge_normalize_one(
        void            *memctx
 ) {
        struct berval   nval;
+       struct berval   *nvalp;
        int             rc;
 
        if ( desc->ad_type->sat_equality->smr_normalize ) {
@@ -242,10 +243,15 @@ attr_merge_normalize_one(
                if ( rc != LDAP_SUCCESS ) {
                        return rc;
                }
+               nvalp = &nval;
+       } else {
+               nvalp = NULL;
        }
 
-       rc = attr_merge_one( e, desc, val, &nval );
-       ch_free( nval.bv_val );
+       rc = attr_merge_one( e, desc, val, nvalp );
+       if ( nvalp != NULL ) {
+               ch_free( nval.bv_val );
+       }
        return rc;
 }