Bookmarks: Catch some invalid room jids

Fixes #111

1 files changed, 12 insertions, 0 deletions

diff --git a/nbxmpp/modules/bookmarks.py b/nbxmpp/modules/bookmarks.py
index 302ecdf..fa32b28 100644
--- a/nbxmpp/modules/bookmarks.py
+++ b/nbxmpp/modules/bookmarks.py
@@ -140,6 +140,12 @@ class Bookmarks(BaseModule):
                                   error)
                 continue
 
+            if jid.localpart is None or jid.resource is not None:
+                self._log.warning('Invalid JID: "%s", %s',
+                                  conf.getAttr('jid'),
+                                  error)
+                continue
+
             autojoin = self._parse_autojoin(conf.getAttr('autojoin'))
             nick = self._parse_nickname(conf.getTagData('nick'))
             name = conf.getAttr('name') or None
@@ -170,6 +176,12 @@ class Bookmarks(BaseModule):
                               error)
             return None
 
+        if jid.localpart is None or jid.resource is not None:
+            self._log.warning('Invalid JID: "%s", %s',
+                              item.getAttr('id'),
+                              error)
+            return None
+
         autojoin = self._parse_autojoin(conference.getAttr('autojoin'))
         nick = self._parse_nickname(conference.getTagData('nick'))
         name = conference.getAttr('name') or None