Changeset 1522faf for otr.c

Timestamp:

2015-04-06T02:26:44Z (9 years ago)

Author:

dequis <dx@…>

Children:

d16e951

Parents:

71f87ba (diff), 69982f8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

dequis <dx@…> (06-04-15 02:24:35)

git-committer:

dequis <dx@…> (06-04-15 02:26:44)

Message:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc_im.c
protocols/jabber/conference.c

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