From 48776fe36afe559ee21cd450154805a2f30ee1de Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Mar 06 2012 01:49:20 +0000
Subject: memleak in normalize_mods2bvals


do not re malloc the berval again - only need to do it once
Reviewed by: nhosoi (Thanks!)
(cherry picked from commit f6e4d3d0d4313ef9b4396ab8433a1c260989274b)
(cherry picked from commit b05139ba374e947fad681d6c97af5dc3800c4bda)

---

diff --git a/ldap/servers/slapd/util.c b/ldap/servers/slapd/util.c
index 9cd3656..649b3a9 100644
--- a/ldap/servers/slapd/util.c
+++ b/ldap/servers/slapd/util.c
@@ -464,16 +464,13 @@ normalize_mods2bvals(const LDAPMod **mods)
                  normmbvp = normalized_mods[w]->mod_bvalues; 
                  mvp && *mvp; mvp++, normmbvp++)
             {
-                *normmbvp = 
-                    (struct berval *)slapi_ch_malloc(sizeof(struct berval));
-        
                 vlen = strlen(*mvp);
 
+                *normmbvp = 
+                    (struct berval *)slapi_ch_malloc(sizeof(struct berval));
                 if (is_dn_syntax) {
                     Slapi_DN *sdn = slapi_sdn_new_dn_byref(*mvp);
                     if (slapi_sdn_get_dn(sdn)) {
-                        *normmbvp = 
-                        (struct berval *)slapi_ch_malloc(sizeof(struct berval));
                         (*normmbvp)->bv_val = 
                                   slapi_ch_strdup(slapi_sdn_get_dn(sdn));
                         (*normmbvp)->bv_len = slapi_sdn_get_ndn_len(sdn);