diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-07-31 15:11:27 +0200 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-07-31 15:11:27 +0200 |
| commit | c4e56a8ee96ad721a8be6e2448660bf0d93f91f0 (patch) | |
| tree | 85572c8b85a23385b9140fcbcc973eac1a81c5f1 /synapse | |
| parent | Should now work, unless we can't find the redaction event which happens for s... (diff) | |
| download | synapse-c4e56a8ee96ad721a8be6e2448660bf0d93f91f0.tar.xz | |
Ignore invalid redactions in _get_event_from_row
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/storage/events_worker.py | 5 |
1 files changed, 5 insertions, 0 deletions
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 |