Changeset 098a75b

Timestamp:

2015-03-22T13:35:08Z (10 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

Files:

• irc_im.c (modified) (3 diffs)
• lib/ssl_gnutls.c (modified) (4 diffs)
• otr.c (modified) (6 diffs)
• protocols/jabber/jabber_util.c (modified) (1 diff)
• protocols/msn/msn_util.c (modified) (4 diffs)
• protocols/nogaim.c (modified) (7 diffs)
• storage_xml.c (modified) (1 diff)

irc_im.c

@@ -235 +235 @@
                         } else {
                                 /* Modules can swallow messages. */
-                                return TRUE;
+                                goto cleanup;
                         }
                 }
@@ -250 +250 @@
         wrapped = word_wrap(msg, 425);
         irc_send_msg(iu, "PRIVMSG", dst, wrapped, prefix);
-
         g_free(wrapped);
+
+cleanup:
         g_free(prefix);
         g_free(msg);
@@ -291 +292 @@
 
         irc_send_msg((irc_user_t *) bu->ui_data, "NOTICE", irc->user->nick, msg->str, NULL);
+
+        g_string_free(msg, TRUE);
 
         return TRUE;

lib/ssl_gnutls.c

@@ -124 +124 @@
 
         if (conn->fd < 0) {
+                g_free(conn->hostname);
                 g_free(conn);
                 return NULL;
@@ -314 +315 @@
         if (source == -1) {
                 conn->func(conn->data, 0, NULL, cond);
+                g_free(conn->hostname);
                 g_free(conn);
                 return FALSE;
@@ -355 +357 @@
                         conn->func(conn->data, 0, NULL, cond);
 
-                        gnutls_deinit(conn->session);
-                        closesocket(conn->fd);
-
-                        g_free(conn);
+                        ssl_disconnect(conn);
                 }
         } else {
@@ -364 +363 @@
                         conn->func(conn->data, stver, NULL, cond);
 
-                        gnutls_deinit(conn->session);
-                        closesocket(conn->fd);
-
-                        g_free(conn);
+                        ssl_disconnect(conn);
                 } else {
                         /* For now we can't handle non-blocking perfectly everywhere... */

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: */

protocols/jabber/jabber_util.c

@@ -566 +566 @@
 
         if ((s = strchr(jid, '=')) == NULL) {
+                g_free(jid);
                 return NULL;
         }

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);
 }
 

protocols/nogaim.c

@@ -498 +498 @@
 };
 
-static void imcb_ask_auth_cb_no(void *data)
+static void imcb_ask_cb_free(void *data)
 {
         struct imcb_ask_cb_data *cbd = data;
-
-        cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle);
 
         g_free(cbd->handle);
@@ -508 +506 @@
 }
 
+static void imcb_ask_auth_cb_no(void *data)
+{
+        struct imcb_ask_cb_data *cbd = data;
+
+        cbd->ic->acc->prpl->auth_deny(cbd->ic, cbd->handle);
+
+        imcb_ask_cb_free(cbd);
+}
+
 static void imcb_ask_auth_cb_yes(void *data)
 {
@@ -514 +521 @@
         cbd->ic->acc->prpl->auth_allow(cbd->ic, cbd->handle);
 
-        g_free(cbd->handle);
-        g_free(cbd);
+        imcb_ask_cb_free(cbd);
 }
 
@@ -535 +541 @@
         data->handle = g_strdup(handle);
         query_add((irc_t *) ic->bee->ui_data, ic, s,
-                  imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, g_free, data);
-}
-
-
-static void imcb_ask_add_cb_no(void *data)
-{
-        g_free(((struct imcb_ask_cb_data*) data)->handle);
-        g_free(data);
+                  imcb_ask_auth_cb_yes, imcb_ask_auth_cb_no, imcb_ask_cb_free, data);
+
+        g_free(s);
 }
 
@@ -551 +552 @@
         cbd->ic->acc->prpl->add_buddy(cbd->ic, cbd->handle, NULL);
 
-        imcb_ask_add_cb_no(data);
+        imcb_ask_cb_free(data);
 }
 
 void imcb_ask_add(struct im_connection *ic, const char *handle, const char *realname)
 {
-        struct imcb_ask_cb_data *data = g_new0(struct imcb_ask_cb_data, 1);
+        struct imcb_ask_cb_data *data;
         char *s;
 
@@ -564 +565 @@
         }
 
+        data = g_new0(struct imcb_ask_cb_data, 1);
+
         s = g_strdup_printf("The user %s is not in your buddy list yet. Do you want to add him/her now?", handle);
 
@@ -569 +572 @@
         data->handle = g_strdup(handle);
         query_add((irc_t *) ic->bee->ui_data, ic, s,
-                  imcb_ask_add_cb_yes, imcb_ask_add_cb_no, g_free, data);
+                  imcb_ask_add_cb_yes, imcb_ask_cb_free, imcb_ask_cb_free, data);
+
+        g_free(s);
 }
 

storage_xml.c

@@ -128 +128 @@
                 }
         } else {
+                g_free(pass_cr);
+                g_free(password);
                 return XT_ABORT;
         }