# HG changeset patch
# User franky
# Date 1485719051 -3600
# Node ID eb96666502f5805c3968e3c328567c6522cf743c
# Parent  2a9569fd7644ce02baa2dde47ad3823a4cff98a3
Carbons: Check barejid in sent messages, too

diff -r 2a9569fd7644 -r eb96666502f5 mcabber/mcabber/xmpp.c
--- a/mcabber/mcabber/xmpp.c	Thu Jan 26 22:51:20 2017 +0100
+++ b/mcabber/mcabber/xmpp.c	Sun Jan 29 20:44:11 2017 +0100
@@ -1136,6 +1136,13 @@
     LmMessageNode *xenc;
     const char *carbon_name = x->name;
     carbons = TRUE;
+
+    // Check envelope JID for carbon messages
+    if (!jid_equal(lm_connection_get_jid(lconnection), bjid)) {
+      scr_LogPrint(LPRINT_LOGNORM, "Received invalid carbon copy from %s.", bjid);
+      goto handle_messages_return;
+    }
+
     // Go 1 level deeper to the forwarded message
     x = lm_message_node_find_xmlns(x, NS_FORWARD);
     if (x)
@@ -1158,15 +1165,6 @@
 
     // Parse a message that is send to one of our other resources
     if (!g_strcmp0(carbon_name, "received")) {
-      // Check envelope JID for carbon messages
-      gchar *self_bjid = jidtodisp(lm_connection_get_jid(lconnection));
-      if (g_strcmp0(self_bjid, bjid)) {
-        scr_LogPrint(LPRINT_LOGNORM, "Received invalid carbon copy!");
-        g_free(self_bjid);
-        goto handle_messages_return;
-      }
-      g_free(self_bjid);
-
       from = lm_message_node_get_attribute(x, "from");
       if (!from) {
         scr_LogPrint(LPRINT_LOGNORM, "Malformed carbon copy!");