Changeset 098a75b for otr.c

Timestamp:

2015-03-22T13:35:08Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

b95d03b

Parents:

2dd23da

git-author:

dequis <dx@…> (21-03-15 08:26:20)

git-committer:

dequis <dx@…> (22-03-15 13:35:08)

Message:

Fix a bunch of memory leaks

• irc_im.c:
  • bee_irc_user_msg: strdup leaks when otr swallows messages
  • bee_irc_user_action_response: GString leak in all ctcp replies
• otr.c:
  • call g_slist_free() on the list of the otr_policy setting
  • otr_filter_msg_in: call otrl_tlv_free() if "tlvs" are returned
  • otr_filter_msg_out: don't g_strdup() if the message should be ignored
  • log_otr_message: g_strdup_vprintf() leaks always
• nogaim.c:
  • imcb_ask_auth/imcb_ask_add: leaks in g_strdup_printf()
  • imcb_ask_add leaks imcb_ask_cb_data if the user already exists
  • add imcb_ask_cb_free() to correctly free its data
• msn_util.c: add msn_buddy_ask_free(), ditto
• storage_xml.c: pass_cr/password if base64_decode or arc_decode fail
• ssl_gnutls.c: conn->hostname leak in error conditions, like invalid certs
• jabber_util.c: jabber_buddy_by_ext_jid() leaks jid if it's not an ext jid

File:

• otr.c (modified) (6 diffs)

otr.c

@@ -287 +287 @@
 void otr_irc_free(irc_t *irc)
 {
+        set_t *s;
         otr_t *otr = irc->otr;
 
@@ -292 +293 @@
         b_event_remove(otr->timer);
         otrl_userstate_free(otr->us);
+
+        s = set_find(&irc->b->set, "otr_policy");
+        g_slist_free(s->eval_data);
+
         if (otr->keygen) {
                 kill(otr->keygen, SIGTERM);
@@ -434 +439 @@
                                             ic->acc->user, ic->acc->prpl->name, iu->bu->handle, msg, &newmsg,
                                             &tlvs, NULL, NULL, NULL);
+
+        if (tlvs) {
+                otrl_tlv_free(tlvs);
+        }
 
         if (ignore_msg) {
@@ -472 +481 @@
                 /* libotr wants us to replace our message */
                 /* NB: caller will free old msg */
-                msg = g_strdup(otrmsg);
+                msg = st ? NULL : g_strdup(otrmsg);
                 otrl_message_free(otrmsg);
         }
@@ -1325 +1334 @@
 
         log_message(LOGLVL_INFO, "otr: %s", msg);
+
+        g_free(msg);
 }
 
@@ -2075 +2086 @@
         }
 }
-
-/* vim: set noet ts=4 sw=4: */