[Fedora-directory-commits] ldapserver/ldap/servers/plugins/memberof memberof.c, 1.5, 1.6

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24511

Modified Files:
	memberof.c 
Log Message:
Resolves: 440474
Summary: Fixed memory leaks in memberOf plug-in.



Index: memberof.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/memberof/memberof.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- memberof.c	3 Apr 2008 16:52:46 -0000	1.5
+++ memberof.c	3 Apr 2008 23:04:11 -0000	1.6
@@ -585,7 +585,7 @@
 		/* get the mod set */
 		slapi_pblock_get(pb, SLAPI_MODIFY_MODS, &mods);
 		smods = slapi_mods_new();
-		slapi_mods_init_passin(smods, mods);
+		slapi_mods_init_byref(smods, mods);
 
 		next_mod = slapi_mod_new();
 		smod = slapi_mods_get_first_smod(smods, next_mod);
@@ -653,6 +653,7 @@
 		}
 
 		slapi_mod_free(&next_mod);
+		slapi_mods_free(&smods);
 	}
 
 	slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM,
@@ -923,7 +924,7 @@
 			slapi_log_error( SLAPI_LOG_PLUGIN,
 				MEMBEROF_PLUGIN_SUBSYSTEM,
 				"memberof_modop_one_r: not processing memberOf "
-				"operations  on self entry: %s\n", this_dn_val);
+				"operations on self entry: %s\n", this_dn_val);
 			slapi_value_free(&to_dn_val);
 			slapi_value_free(&this_dn_val);     
 			goto bail;
@@ -1009,6 +1010,7 @@
 	}
 
 bail:
+	slapi_entry_free(e);
 	return rc;
 }
 
@@ -1307,6 +1309,7 @@
 			rc = 0 == slapi_attr_value_find(
 				attr, slapi_value_get_berval(memberdn));
 		}
+		slapi_entry_free(group_e);
 	}
 
 	slapi_sdn_free(&sdn);
@@ -1612,6 +1615,8 @@
 				}
 			}
 		}
+		slapi_ch_free((void **)&pre_array);
+		slapi_ch_free((void **)&post_array);
 	}
 	
 	return 0;
@@ -1825,6 +1830,8 @@
 	}
 
 bail:
+	slapi_entry_free(group_e);
+	slapi_entry_free(opto_e);
 	slapi_ch_free_string(&filter_str);
 
 	slapi_log_error( SLAPI_LOG_TRACE, MEMBEROF_PLUGIN_SUBSYSTEM,