Changeset 3bb333c for protocols/purple

Timestamp:

2015-03-11T21:24:15Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

89db90e, fedc8f1

Parents:

afbad28

git-author:

dequis <dx@…> (04-03-15 00:49:21)

git-committer:

dequis <dx@…> (11-03-15 21:24:15)

Message:

purple: Implement 'close_request' to prevent segfaults after logout

Fixes trac bug 1190 ("Accepting SSL certs too late resets bitlbee-libpurple")

To reproduce:

1. Connect to server with self-signed ssl certificate (downgrading to libpurple 2.10.9 might be required to actually get the request)
2. Disconnect the account
3. Type "yes"
4. Acquire segfault.

Normally, query_del_by_conn() would handle this, but some requests have
no account context at all. Yeah, it sucks. This is how pidgin handles it.

File:

• protocols/purple/purple.c (modified) (2 diffs)

protocols/purple/purple.c

@@ -1048 +1048 @@
 }
 
+/* So it turns out some requests have no account context at all, because
+ * libpurple hates us. This means that query_del_by_conn() won't remove those
+ * on logout, and will segfault if the user replies. That's why this exists.
+ */
+static void prplcb_close_request(PurpleRequestType type, void *data)
+{
+        if (type == PURPLE_REQUEST_ACTION) {
+                struct prplcb_request_action_data *pqad = data;
+                query_del(local_bee->ui_data, pqad->bee_data);
+        }
+        /* Add the request input handler here when that becomes a thing */
+}
+
 /*
 static void prplcb_request_test()
@@ -1062 +1075 @@
         NULL,
         NULL,
-        NULL,
+        prplcb_close_request,
         NULL,
 };