Changeset a244877

Timestamp:

2016-04-17T09:32:27Z (8 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

720f7a9

Parents:

991c75f

Message:

twitter: Fix a couple of leaks of mutes_ids and retweets_ids

Just freeing the list on logout and when removing items from them.

Also remove the "checking mutes" debug which is disproportionately noisy
compared to the rest of the protocol.

Location:

protocols/twitter

Files:

• twitter.c (modified) (1 diff)
• twitter_lib.c (modified) (2 diffs)

protocols/twitter/twitter.c

@@ -687 +687 @@
                 }
 
+                g_slist_foreach(td->mutes_ids, (GFunc) g_free, NULL);
+                g_slist_free(td->mutes_ids);
+
+                g_slist_foreach(td->noretweets_ids, (GFunc) g_free, NULL);
+                g_slist_free(td->noretweets_ids);
+
                 http_close(td->stream);
                 twitter_filter_remove_all(ic);

protocols/twitter/twitter_lib.c

@@ -955 +955 @@
         /* Check this is not a tweet that should be muted */
         uid_str = g_strdup_printf("%" PRIu64, status->user->uid);
-        if (getenv("BITLBEE_DEBUG")) {
-                GSList *item;
-                fprintf(stderr, "Checking mutes; this uid=%s\n", uid_str);
-                for (item = td->mutes_ids; item != NULL; item = item->next) {
-                        fprintf(stderr, "  id: %s\n", (char *)item->data);
-                }
-        }
+
         if (g_slist_find_custom(td->mutes_ids, uid_str, (GCompareFunc)strcmp)) {
                 g_free(uid_str);
@@ -1164 +1158 @@
                 if ((found = g_slist_find_custom(td->mutes_ids, uid_str,
                                                 (GCompareFunc)strcmp))) {
-                        td->mutes_ids = g_slist_remove(td->mutes_ids, found);
+                        char *found_str = found->data;
+                        td->mutes_ids = g_slist_delete_link(td->mutes_ids, found);
+                        g_free(found_str);
                 }
                 g_free(uid_str);