Changeset 2c5ab49

Timestamp:

2015-03-15T04:34:43Z (10 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

2dd23da

Parents:

6a48992

git-author:

dequis <dx@…> (14-03-15 01:03:43)

git-committer:

dequis <dx@…> (15-03-15 04:34:43)

Message:

purple: prplcb_close_request() improvements

• Added support for PURPLE_REQUEST_INPUT
• Changed memory management to do the free() of data through purple_request_close(), letting purple know that the request was answered, and fixing use-after-free issues with it

File:

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

protocols/purple/purple.c

@@ -49 +49 @@
         ri_callback_t data_callback;
         void *user_data;
+        struct im_connection *ic;
+        char *buddy;
+        guint id;
 };
 
@@ -1017 +1020 @@
                 pqad->yes(pqad->user_data, pqad->yes_i);
         }
-        g_free(pqad);
 }
 
@@ -1027 +1029 @@
                 pqad->no(pqad->user_data, pqad->no_i);
         }
-        g_free(pqad);
+}
+
+/* q->free() callback from query_del()*/
+static void prplcb_request_action_free(void *data)
+{
+        struct prplcb_request_action_data *pqad = data;
+
+        pqad->bee_data = NULL;
+        purple_request_close(PURPLE_REQUEST_ACTION, pqad);
 }
 
@@ -1062 +1072 @@
         q = g_strdup_printf("Request: %s\n\n%s\n\n%s", title, primary, secondary);
         pqad->bee_data = query_add(local_bee->ui_data, purple_ic_by_pa(account), q,
-                                   prplcb_request_action_yes, prplcb_request_action_no, g_free, pqad);
+                                   prplcb_request_action_yes, prplcb_request_action_no,
+                                   prplcb_request_action_free, pqad);
 
         g_free(q);
@@ -1075 +1086 @@
 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()
-{
-        fprintf( stderr, "bla\n" );
-}
-*/
+        struct prplcb_request_action_data *pqad;
+        struct request_input_data *ri;
+        struct purple_data *pd;
+
+        if (!data) {
+                return;
+        }
+
+        switch (type) {
+        case PURPLE_REQUEST_ACTION:
+                pqad = data;
+                /* if this is null, it's because query_del was run already */
+                if (pqad->bee_data) {
+                        query_del(local_bee->ui_data, pqad->bee_data);
+                }
+                g_free(pqad);
+                break;
+        case PURPLE_REQUEST_INPUT:
+                ri = data;
+                pd = ri->ic->proto_data;
+                imcb_remove_buddy(ri->ic, ri->buddy, NULL);
+                g_free(ri->buddy);
+                g_hash_table_remove(pd->input_requests, GUINT_TO_POINTER(ri->id));
+                break;
+        default:
+                g_free(data);
+                break;
+        }
+
+}
 
 void* prplcb_request_input(const char *title, const char *primary,
@@ -1099 +1127 @@
         struct request_input_data *ri = g_new0(struct request_input_data, 1);
         guint id = pd->next_request_id++;
-        gchar *buddy = g_strdup_printf("%s_%u", PURPLE_REQUEST_HANDLE, id);
-
+
+        ri->id = id;
+        ri->ic = ic;
+        ri->buddy = g_strdup_printf("%s_%u", PURPLE_REQUEST_HANDLE, id);
         ri->data_callback = (ri_callback_t) ok_cb;
         ri->user_data = user_data;
         g_hash_table_insert(pd->input_requests, GUINT_TO_POINTER(id), ri);
 
-        imcb_add_buddy(ic, buddy, NULL);
-        imcb_buddy_msg(ic, buddy, secondary, 0, 0);
-
-        g_free(buddy);
-        return 0;
+        imcb_add_buddy(ic, ri->buddy, NULL);
+        imcb_buddy_msg(ic, ri->buddy, secondary, 0, 0);
+
+        return ri;
 }
 
@@ -1116 +1145 @@
 {
         struct purple_data *pd = ic->proto_data;
-        struct request_input_data *ri = g_hash_table_lookup(pd->input_requests,
-                                                            GUINT_TO_POINTER(id));
-
-        if (ri) {
-                ri->data_callback(ri->user_data, message);
-        }
-
-        imcb_remove_buddy(ic, who, NULL);
-        g_hash_table_remove(pd->input_requests, GUINT_TO_POINTER(id));
+        struct request_input_data *ri;
+
+        if (!(ri = g_hash_table_lookup(pd->input_requests, GUINT_TO_POINTER(id)))) {
+                return;
+        }
+
+        ri->data_callback(ri->user_data, message);
+
+        purple_request_close(PURPLE_REQUEST_INPUT, ri);
 }