Changeset 098a75b for protocols/msn/msn_util.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:

• protocols/msn/msn_util.c (modified) (4 diffs)

protocols/msn/msn_util.c

@@ -174 +174 @@
 };
 
-static void msn_buddy_ask_yes(void *data)
+static void msn_buddy_ask_free(void *data)
 {
         struct msn_buddy_ask_data *bla = data;
-
-        msn_buddy_list_add(bla->ic, MSN_BUDDY_AL, bla->handle, bla->realname, NULL);
-
-        imcb_ask_add(bla->ic, bla->handle, NULL);
 
         g_free(bla->handle);
@@ -187 +183 @@
 }
 
+static void msn_buddy_ask_yes(void *data)
+{
+        struct msn_buddy_ask_data *bla = data;
+
+        msn_buddy_list_add(bla->ic, MSN_BUDDY_AL, bla->handle, bla->realname, NULL);
+
+        imcb_ask_add(bla->ic, bla->handle, NULL);
+
+        msn_buddy_ask_free(bla);
+}
+
 static void msn_buddy_ask_no(void *data)
 {
@@ -193 +200 @@
         msn_buddy_list_add(bla->ic, MSN_BUDDY_BL, bla->handle, bla->realname, NULL);
 
-        g_free(bla->handle);
-        g_free(bla->realname);
-        g_free(bla);
+        msn_buddy_ask_free(bla);
 }
 
@@ -216 +221 @@
                    "The user %s (%s) wants to add you to his/her buddy list.",
                    bu->handle, bu->fullname);
-        imcb_ask(bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no);
+
+        imcb_ask_with_free(bu->ic, buf, bla, msn_buddy_ask_yes, msn_buddy_ask_no, msn_buddy_ask_free);
 }