[Fedora-directory-commits] ldapserver/ldap/servers/plugins/collation collate.c, 1.8, 1.9

[Nathan Kinder]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/collation
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12327/ldap/servers/plugins/collation

Modified Files:
	collate.c 
Log Message:
Resolves: 430321
Summary: Fixed memory leak in collator plug-in.



Index: collate.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/collation/collate.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- collate.c	10 Nov 2006 23:44:56 -0000	1.8
+++ collate.c	25 Nov 2008 16:15:09 -0000	1.9
@@ -230,7 +230,6 @@
     UCollator*         collator;
     UConverter*	       converter;
     struct berval**    ix_keys;
-    int                is_default_collator;
 } collation_indexer_t;
 
 /*
@@ -386,8 +385,8 @@
 	ucnv_close(etc->converter);
 	etc->converter = NULL;
     }
-    if (!etc->is_default_collator) {
-	/* Don't delete the default collation - it seems to cause problems */
+
+    if (etc->collator) {
 	ucol_close(etc->collator);
 	etc->collator = NULL;
     }
@@ -469,7 +468,6 @@
 				   oid, profile->decomposition, err);
 		    }
 		    etc->collator = coll;
-		    etc->is_default_collator = is_default;
 		    for (id = collation_id; *id; ++id) {
 			if ((*id)->profile == profile) {
 			    break; /* found the 'official' id */