aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00
Code

Fix GSList handling in new MAM code

Browse Source 
This patch was provided by @paulfertser and applied by @jubalh.
Thanks a lot Paul!
This commit is contained in:
Paul Fertser 2022-10-21 16:28:30 +02:00 committed by Michael Vetter
parent a74a3a4312
commit 6a47266f0b
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/xmpp/iq.c
View File

@ -269,8 +269,6 @@ iq_handlers_init(void)
id_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)_iq_id_handler_free); id_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)_iq_id_handler_free);
rooms_cache = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)xmpp_stanza_release); rooms_cache = g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)xmpp_stanza_release);
late_delivery_windows = malloc(sizeof(GSList *));
late_delivery_windows->data = NULL;
} }
void void
@ -2541,12 +2539,12 @@ _disco_items_result_handler(xmpp_stanza_t* const stanza)
received_disco_items = TRUE; received_disco_items = TRUE;
connection_set_disco_items(items); connection_set_disco_items(items);
while (late_delivery_windows->data) { while (late_delivery_windows) {
LateDeliveryUserdata* del_data = late_delivery_windows->data; LateDeliveryUserdata* del_data = late_delivery_windows->data;
_iq_mam_request(del_data->win, del_data->startdate, del_data->enddate); _iq_mam_request(del_data->win, del_data->startdate, del_data->enddate);
late_delivery_windows = g_slist_next(late_delivery_windows);
free(del_data); free(del_data);
late_delivery_windows = g_slist_delete_link(late_delivery_windows,
late_delivery_windows);
} }
} }
@ -2702,14 +2700,11 @@ iq_mam_request(ProfChatWin* win, GDateTime* enddate)
// Save request for later if disco items haven't been received yet // Save request for later if disco items haven't been received yet
if (!received_disco_items) { if (!received_disco_items) {
if (late_delivery_windows->data == NULL) { LateDeliveryUserdata* cur_del_data = malloc(sizeof(LateDeliveryUserdata));
LateDeliveryUserdata* cur_del_data = malloc(sizeof(LateDeliveryUserdata)); cur_del_data->win = win;
cur_del_data->win = win; cur_del_data->enddate = enddate;
cur_del_data->enddate = enddate; cur_del_data->startdate = startdate;
cur_del_data->startdate = startdate; late_delivery_windows = g_slist_append(late_delivery_windows, cur_del_data);
late_delivery_windows->data = cur_del_data;
}
late_delivery_windows = g_slist_append(late_delivery_windows, NULL);
} }