devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-08-01 02:36:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix memleak.

Browse Source 
In some cases it was possible that the `roster_pending_presence` list was
not free'd correctly.

Signed-off-by: Steffen Jaeckel <jaeckel-floss@eyet-services.de>
This commit is contained in:
Steffen Jaeckel
2023-05-22 16:59:48 +02:00
parent e668c4f7df
commit 6f1ea087c8
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/xmpp/roster_list.c
View File

@@ -104,6 +104,17 @@ roster_create(void)
roster_pending_presence = NULL; roster_pending_presence = NULL;
} }
static void
_pendingPresence_free(ProfPendingPresence* presence)
{
if (!presence)
return;
if (presence->last_activity)
g_date_time_unref(presence->last_activity);
free(presence->barejid);
free(presence);
}
void void
roster_destroy(void) roster_destroy(void)
{ {
@@ -119,6 +130,10 @@ roster_destroy(void)
free(roster); free(roster);
roster = NULL; roster = NULL;
if (roster_pending_presence)
g_slist_free_full(roster_pending_presence, (GDestroyNotify)_pendingPresence_free);
roster_pending_presence = NULL;
} }
gboolean gboolean
@@ -716,15 +731,6 @@ roster_compare_presence(PContact a, PContact b)
} }
} }
static void
_pendingPresence_free(ProfPendingPresence* presence)
{
if (!presence)
return;
free(presence->barejid);
free(presence);
}
void void
roster_process_pending_presence(void) roster_process_pending_presence(void)
{ {
@@ -734,10 +740,6 @@ roster_process_pending_presence(void)
for (iter = roster_pending_presence; iter != NULL; iter = iter->next) { for (iter = roster_pending_presence; iter != NULL; iter = iter->next) {
ProfPendingPresence* presence = iter->data; ProfPendingPresence* presence = iter->data;
roster_update_presence(presence->barejid, presence->resource, presence->last_activity); roster_update_presence(presence->barejid, presence->resource, presence->last_activity);
/* seems like resource isn't free on the calling side */
if (presence->last_activity) {
g_date_time_unref(presence->last_activity);
}
} }
g_slist_free_full(roster_pending_presence, (GDestroyNotify)_pendingPresence_free); g_slist_free_full(roster_pending_presence, (GDestroyNotify)_pendingPresence_free);