From c18b7f4d67a4b5e2cd026b47f9d51dae74427c1d Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 20 Aug 2015 22:02:58 +0100 Subject: [PATCH 1/2] Free id for OTR messages --- src/command/commands.c | 6 ++++-- src/otr/otr.c | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/command/commands.c b/src/command/commands.c index 5e7146fc..7167e26d 100644 --- a/src/command/commands.c +++ b/src/command/commands.c @@ -4530,7 +4530,8 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args) if (!otr_is_secure(barejid)) { char *otr_query_message = otr_start_query(); - message_send_chat_otr(barejid, otr_query_message); + char *id = message_send_chat_otr(barejid, otr_query_message); + free(id); return TRUE; } @@ -4562,7 +4563,8 @@ cmd_otr(ProfWin *window, const char * const command, gchar **args) } char *otr_query_message = otr_start_query(); - message_send_chat_otr(chatwin->barejid, otr_query_message); + char *id = message_send_chat_otr(chatwin->barejid, otr_query_message); + free(id); return TRUE; } diff --git a/src/otr/otr.c b/src/otr/otr.c index e61a0e47..a7790bcb 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -110,7 +110,8 @@ static void cb_inject_message(void *opdata, const char *accountname, const char *protocol, const char *recipient, const char *message) { - message_send_chat_otr(recipient, message); + char *id = message_send_chat_otr(recipient, message); + free(id); } static void @@ -291,7 +292,8 @@ otr_on_message_recv(const char * const barejid, const char * const resource, con memmove(whitespace_base, whitespace_base+tag_length, tag_length); char *otr_query_message = otr_start_query(); cons_show("OTR Whitespace pattern detected. Attempting to start OTR session..."); - message_send_chat_otr(barejid, otr_query_message); + char *id = message_send_chat_otr(barejid, otr_query_message); + free(id); } } } @@ -304,7 +306,8 @@ otr_on_message_recv(const char * const barejid, const char * const resource, con if (policy == PROF_OTRPOLICY_ALWAYS && *was_decrypted == FALSE && !whitespace_base) { char *otr_query_message = otr_start_query(); cons_show("Attempting to start OTR session..."); - message_send_chat_otr(barejid, otr_query_message); + char *id = message_send_chat_otr(barejid, otr_query_message); + free(id); } return decrypted; From d791e4dd597ecaacf3864e4af4f60953ba24467f Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 20 Aug 2015 22:23:31 +0100 Subject: [PATCH 2/2] Free OTR TLVS --- src/otr/otr.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/otr/otr.c b/src/otr/otr.c index a7790bcb..53433642 100644 --- a/src/otr/otr.c +++ b/src/otr/otr.c @@ -708,6 +708,14 @@ otr_encrypt_message(const char * const to, const char * const message) } } +static void +_otr_tlv_free(OtrlTLV *tlvs) +{ + if (tlvs) { + otrl_tlv_free(tlvs); + } +} + char * otr_decrypt_message(const char * const from, const char * const message, gboolean *was_decrypted) { @@ -723,7 +731,6 @@ otr_decrypt_message(const char * const from, const char * const message, gboolea // common tlv handling OtrlTLV *tlv = otrl_tlv_find(tlvs, OTRL_TLV_DISCONNECTED); if (tlv) { - if (context) { otrl_context_force_plaintext(context); ui_gone_insecure(from); @@ -732,16 +739,19 @@ otr_decrypt_message(const char * const from, const char * const message, gboolea // library version specific tlv handling otrlib_handle_tlvs(user_state, &ops, context, tlvs, smp_initiators); + _otr_tlv_free(tlvs); return NULL; // message was decrypted, return to user } else if (decrypted) { + _otr_tlv_free(tlvs); *was_decrypted = TRUE; return decrypted; // normal non OTR message } else { + _otr_tlv_free(tlvs); *was_decrypted = FALSE; return strdup(message); }