From a0a956ee0878d24bd06be7f5d75dc4ccd4e7901d Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Sun, 22 Dec 2019 04:10:53 +0100
Subject: Properly check Jids everywhere

---
 .../src/module/xep/0030_service_discovery/items_result.vala    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'xmpp-vala/src/module/xep/0030_service_discovery')

diff --git a/xmpp-vala/src/module/xep/0030_service_discovery/items_result.vala b/xmpp-vala/src/module/xep/0030_service_discovery/items_result.vala
index 16a9f5ec..233a0c06 100644
--- a/xmpp-vala/src/module/xep/0030_service_discovery/items_result.vala
+++ b/xmpp-vala/src/module/xep/0030_service_discovery/items_result.vala
@@ -9,9 +9,13 @@ public class ItemsResult {
         owned get {
             ArrayList<Item> ret = new ArrayList<Item>();
             foreach (StanzaNode feature_node in iq.stanza.get_subnode("query", NS_URI_ITEMS).get_subnodes("item", NS_URI_ITEMS)) {
-                ret.add(new Item(Jid.parse(feature_node.get_attribute("jid", NS_URI_ITEMS)),
-                                        feature_node.get_attribute("name", NS_URI_ITEMS),
-                                        feature_node.get_attribute("node", NS_URI_ITEMS)));
+                try {
+                    ret.add(new Item(new Jid(feature_node.get_attribute("jid", NS_URI_ITEMS)),
+                                feature_node.get_attribute("name", NS_URI_ITEMS),
+                                feature_node.get_attribute("node", NS_URI_ITEMS)));
+                } catch (InvalidJidError e) {
+                    warning("Ignoring service at invalid Jid: %s", e.message);
+                }
             }
             return ret;
         }
-- 
cgit v1.2.3-54-g00ecf