Changeset 9076a1c

Timestamp:

2015-07-27T23:48:04Z (9 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

10d089d

Parents:

31e2b09

Message:

Fix cleanup of (RPC) groupchats, fixes some crashes at logout time.

Files:

• irc_commands.c (modified) (1 diff)
• protocols/nogaim.c (modified) (1 diff)
• protocols/rpc/rpc.c (modified) (2 diffs)

irc_commands.c

@@ -166 +166 @@
                            showed an error message, or is doing some work
                            before the join should be confirmed. (In the
-                           latter case, the caller should take care of that
+                           latter case, the callee should take care of that
                            confirmation.) TRUE means all's good, let the
                            user join the channel right away. */

protocols/nogaim.c

@@ -413 +413 @@
 
         query_del_by_conn((irc_t *) ic->bee->ui_data, ic);
+
+        /* Throw away groupchats owned by this account. Historically this was only
+           ever done by IM modules which is a bug. But it gives them opportunity
+           to clean up protocol-specific bits as well so keep it that way, just
+           do another cleanup here as a fallback. Don't want to leave any dangling
+           pointers! */
+        while (ic->groupchats) {
+                imcb_chat_free(ic->groupchats->data);
+        }
 
         if (!a) {

protocols/rpc/rpc.c

@@ -409 +409 @@
         json_array_append_integer(params, rc->id);
         rpc_send(gc->ic, rpc);
+
+        struct rpc_connection *rd = gc->ic->proto_data;
+        g_hash_table_remove(rd->groupchats, &rc->id);
         rpc_groupchat_free(gc);
 }
@@ -438 +441 @@
 }
 
+/* When calling this, also make sure the element gets removes from
+   rpc_connection->groupchat. This function doesn't do that because it gets
+   called from within an iterator. */
 static void rpc_groupchat_free(struct groupchat *gc) {
         g_free(gc->data);