From bd0d45ca69587f4f258b738dfa3a55704838081e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 26 Apr 2019 11:13:16 +0100
Subject: Fix infinite loop in presence handler

Fixes #5102
---
 synapse/handlers/presence.py | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'synapse/handlers/presence.py')

diff --git a/synapse/handlers/presence.py b/synapse/handlers/presence.py
index bd1285b15c..59d53f1050 100644
--- a/synapse/handlers/presence.py
+++ b/synapse/handlers/presence.py
@@ -828,6 +828,11 @@ class PresenceHandler(object):
             if typ != EventTypes.Member:
                 continue
 
+            if event_id is None:
+                # state has been deleted, so this is not a join. We only care about
+                # joins.
+                continue
+
             event = yield self.store.get_event(event_id)
             if event.content.get("membership") != Membership.JOIN:
                 # We only care about joins
-- 
cgit 1.4.1