Properly check Jids everywhere

1 files changed, 9 insertions, 5 deletions

diff --git a/libdino/src/service/roster_manager.vala b/libdino/src/service/roster_manager.vala
index 6f004c01..62428882 100644
--- a/libdino/src/service/roster_manager.vala
+++ b/libdino/src/service/roster_manager.vala
@@ -91,11 +91,15 @@ public class RosterStoreImpl : Roster.Storage, Object {
         this.db = db;
 
         foreach (Qlite.Row row in db.roster.select().with(db.roster.account_id, "=", account.id)) {
-            Roster.Item item = new Roster.Item();
-            item.jid = Jid.parse(row[db.roster.jid]);
-            item.name = row[db.roster.handle];
-            item.subscription = row[db.roster.subscription];
-            items[item.jid] = item;
+            try {
+                Roster.Item item = new Roster.Item();
+                item.jid = new Jid(row[db.roster.jid]);
+                item.name = row[db.roster.handle];
+                item.subscription = row[db.roster.subscription];
+                items[item.jid] = item;
+            } catch (InvalidJidError e) {
+                warning("Ignoring roster entry with invalid Jid: %s", e.message);
+            }
         }
     }