From 0b6fac44dc4775e667ac8d956df2295c8b0766d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Fri, 1 Feb 2019 17:03:46 +0100 Subject: [PATCH] Dont fail on malformed pubsub events --- gajim/common/modules/user_activity.py | 2 ++ gajim/common/modules/user_mood.py | 2 ++ gajim/common/modules/util.py | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gajim/common/modules/user_activity.py b/gajim/common/modules/user_activity.py index e23179ac0..6ec034560 100644 --- a/gajim/common/modules/user_activity.py +++ b/gajim/common/modules/user_activity.py @@ -45,6 +45,8 @@ class UserActivity(BaseModule): @event_node(nbxmpp.NS_ACTIVITY) def _activity_received(self, _con, _stanza, properties): data = properties.pubsub_event.data + if data is None: + return for contact in app.contacts.get_contacts(self._account, str(properties.jid)): if data.activity is not None: diff --git a/gajim/common/modules/user_mood.py b/gajim/common/modules/user_mood.py index cc145ebc7..4fe9b2737 100644 --- a/gajim/common/modules/user_mood.py +++ b/gajim/common/modules/user_mood.py @@ -45,6 +45,8 @@ class UserMood(BaseModule): @event_node(nbxmpp.NS_MOOD) def _mood_received(self, _con, _stanza, properties): data = properties.pubsub_event.data + if data is None: + return for contact in app.contacts.get_contacts(self._account, str(properties.jid)): if data.mood is not None: diff --git a/gajim/common/modules/util.py b/gajim/common/modules/util.py index 131f82e70..7ae4b5929 100644 --- a/gajim/common/modules/util.py +++ b/gajim/common/modules/util.py @@ -55,6 +55,8 @@ def event_node(node): def event_node_decorator(func): @wraps(func) def func_wrapper(self, _con, _stanza, properties): + if not properties.is_pubsub_event: + return if properties.pubsub_event.node != node: return func(self, _con, _stanza, properties)