diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2008-11-25 16:15:09 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2008-11-25 16:15:09 +0000 |
| commit | b68be619ceb59d9ad242841be4ebe2abb993d6d8 (patch) | |
| tree | bf6e97a425b0b5afb14563176fb22c772ad829cb | |
| parent | e549330ed3d104f3c31f58951325d80ad1e6a4ba (diff) | |
| download | ds-b68be619ceb59d9ad242841be4ebe2abb993d6d8.tar.gz ds-b68be619ceb59d9ad242841be4ebe2abb993d6d8.tar.xz ds-b68be619ceb59d9ad242841be4ebe2abb993d6d8.zip | |
Resolves: 430321
Summary: Fixed memory leak in collator plug-in.
| -rw-r--r-- | ldap/servers/plugins/collation/collate.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ldap/servers/plugins/collation/collate.c b/ldap/servers/plugins/collation/collate.c index e7e8195d..06bb556a 100644 --- a/ldap/servers/plugins/collation/collate.c +++ b/ldap/servers/plugins/collation/collate.c @@ -230,7 +230,6 @@ typedef struct collation_indexer_t UCollator* collator; UConverter* converter; struct berval** ix_keys; - int is_default_collator; } collation_indexer_t; /* @@ -386,8 +385,8 @@ collation_indexer_destroy (indexer_t* ix) 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 @@ collation_indexer_create (const char* oid) 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 */ |