alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* fix memleak in threading

Browse Source
This commit is contained in:
djcb
2012-04-05 23:08:48 +03:00
parent 3db459b19a
commit ee840997c3
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/mu-threader.c
View File

@ -169,13 +169,10 @@ find_or_create (GHashTable *id_table, MuMsg *msg, guint docid)
* Store this message in the MuContainer's message slot. */ * Store this message in the MuContainer's message slot. */
if (c) { if (c) {
if (!c->msg) { if (!c->msg) {
c->msg = mu_msg_ref (msg); c->msg = mu_msg_ref (msg);
c->docid = docid; c->docid = docid;
return c; return c;
} else { } else {
/* char fakeid[16]; */
/* static unsigned id = 0; */
/* c && c->msg */
/* special case, not in the JWZ algorithm: the /* special case, not in the JWZ algorithm: the
* container exists already and has a message; this * container exists already and has a message; this
* means that we are seeing *another message* with a * means that we are seeing *another message* with a
@ -184,17 +181,15 @@ find_or_create (GHashTable *id_table, MuMsg *msg, guint docid)
* we saw before; use its path as a fake message-id * we saw before; use its path as a fake message-id
* */ * */
MuContainer *c2; MuContainer *c2;
c2 = mu_container_new (msg, docid, "<dup>"); const char* fake_msgid;
fake_msgid = mu_msg_get_path (msg);
c2 = mu_container_new (msg, docid, fake_msgid);
c2->flags = MU_CONTAINER_FLAG_DUP; c2->flags = MU_CONTAINER_FLAG_DUP;
c = mu_container_append_children (c, c2); c = mu_container_append_children (c, c2);
/* add the container to the id-table with a g_hash_table_insert (id_table, (gpointer)fake_msgid, c2);
* fake-id so it will be freed when the
* id_table is destroyed */
/* FIXME: below leads to infloop */
/* snprintf (fakeid, sizeof(fakeid), "%x", ++id); */
/* g_hash_table_insert (id_table, (gpointer)fakeid, c); */
return NULL; /* don't process this message further */ return NULL; /* don't process this message further */
} }
@ -333,9 +328,14 @@ create_containers (MuMsgIter *iter)
static void static void
filter_root_set (const gchar *msgid, MuContainer *c, MuContainer **root_set) filter_root_set (const gchar *msgid, MuContainer *c, MuContainer **root_set)
{ {
/* ignore children */
if (c->parent) if (c->parent)
return; return;
/* ignore duplicates */
if (c->flags & MU_CONTAINER_FLAG_DUP)
return;
if (*root_set == NULL) { if (*root_set == NULL) {
*root_set = c; *root_set = c;
return; return;