From c4e56a8ee96ad721a8be6e2448660bf0d93f91f0 Mon Sep 17 00:00:00 2001 From: Brendan Abolivier Date: Wed, 31 Jul 2019 15:11:27 +0200 Subject: Ignore invalid redactions in _get_event_from_row --- synapse/storage/events_worker.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'synapse/storage/events_worker.py') diff --git a/synapse/storage/events_worker.py b/synapse/storage/events_worker.py index 2983aec55b..b771cf98ce 100644 --- a/synapse/storage/events_worker.py +++ b/synapse/storage/events_worker.py @@ -579,6 +579,11 @@ class EventsWorkerStore(SQLBaseStore): if because.room_id != original_ev.room_id: redacted_event = None + else: + # The lack of a redaction likely means that the redaction is invalid + # and therefore not returned by get_event, so it should be safe to + # just ignore it here. + redacted_event = None cache_entry = _EventCacheEntry( event=original_ev, redacted_event=redacted_event -- cgit 1.5.1