aniani/profanity
1
0
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2024-06-23 21:45:30 +00:00
Code

Fix various OMEMO memleaks

Browse Source
This commit is contained in:
Paul Fariello 2019-07-10 12:27:28 +02:00
parent eb14ae5f03
commit b110da9a92
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/omemo/omemo.c
View File

@ -1363,14 +1363,14 @@ omemo_automatic_start(const char *const recipient)
} else if (g_list_find_custom(account->omemo_disabled, recipient, (GCompareFunc)g_strcmp0)) {
result = FALSE;
} else {
return FALSE;
result = FALSE;
}
break;
case PROF_OMEMOPOLICY_ALWAYS:
if (g_list_find_custom(account->omemo_disabled, recipient, (GCompareFunc)g_strcmp0)) {
result = FALSE;
} else {
return TRUE;
result = TRUE;
}
break;
}

11
src/omemo/store.c
View File

@ -38,10 +38,12 @@
#include "omemo/omemo.h"
#include "omemo/store.h"
static void _g_hash_table_free(GHashTable *hash_table);
GHashTable *
session_store_new(void)
{
return g_hash_table_new_full(g_str_hash, g_str_equal, free, NULL);
return g_hash_table_new_full(g_str_hash, g_str_equal, free, (GDestroyNotify)_g_hash_table_free);
}
GHashTable *
@ -441,3 +443,10 @@ load_sender_key(signal_buffer **record, signal_buffer **user_record,
{
return SG_SUCCESS;
}
static void
_g_hash_table_free(GHashTable *hash_table)
{
g_hash_table_remove_all(hash_table);
g_hash_table_unref(hash_table);
}

6
src/xmpp/connection.c
View File

@ -290,6 +290,7 @@ connection_send_stanza(const char *const stanza)
gboolean
connection_supports(const char *const feature)
{
gboolean ret = FALSE;
GList *jids = g_hash_table_get_keys(conn.features_by_jid);
GList *curr = jids;
@ -297,7 +298,8 @@ connection_supports(const char *const feature)
char *jid = curr->data;
GHashTable *features = g_hash_table_lookup(conn.features_by_jid, jid);
if (features && g_hash_table_lookup(features, feature)) {
return TRUE;
ret = TRUE;
break;
}
curr = g_list_next(curr);
@ -305,7 +307,7 @@ connection_supports(const char *const feature)
g_list_free(jids);
return FALSE;
return ret;
}
char*

9
src/xmpp/stanza.c
View File

@ -1869,6 +1869,15 @@ stanza_attach_publish_options(xmpp_ctx_t *const ctx, xmpp_stanza_t *const iq, co
xmpp_stanza_t *pubsub = xmpp_stanza_get_child_by_ns(iq, STANZA_NS_PUBSUB);
xmpp_stanza_add_child(pubsub, publish_options);
xmpp_stanza_release(access_model_value_text);
xmpp_stanza_release(access_model_value);
xmpp_stanza_release(access_model);
xmpp_stanza_release(form_type_value_text);
xmpp_stanza_release(form_type_value);
xmpp_stanza_release(form_type);
xmpp_stanza_release(x);
xmpp_stanza_release(publish_options);
}
void