diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-11-06 10:01:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-06 10:01:39 +0000 |
| commit | 807ec3bd99908d2991d2b3d0615b0862610c6dc3 (patch) | |
| tree | 1c46d67920643cbaad45ef63e8cbc645f11c172e /synapse/storage/data_stores/main | |
| parent | Add some checks that we aren't using state from rejected events (#6330) (diff) | |
| download | synapse-807ec3bd99908d2991d2b3d0615b0862610c6dc3.tar.xz | |
Fix bug which caused rejected events to be stored with the wrong room state (#6320)
Fixes a bug where rejected events were persisted with the wrong state group. Also fixes an occasional internal-server-error when receiving events over federation which are rejected and (possibly because they are backwards-extremities) have no prev_group. Fixes #6289.
Diffstat (limited to 'synapse/storage/data_stores/main')
| -rw-r--r-- | synapse/storage/data_stores/main/state.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/data_stores/main/state.py b/synapse/storage/data_stores/main/state.py index 3132848034..9e1541988e 100644 --- a/synapse/storage/data_stores/main/state.py +++ b/synapse/storage/data_stores/main/state.py @@ -1231,7 +1231,7 @@ class StateStore(StateGroupWorkerStore, StateBackgroundUpdateStore): # if the event was rejected, just give it the same state as its # predecessor. if context.rejected: - state_groups[event.event_id] = context.prev_group + state_groups[event.event_id] = context.state_group_before_event continue state_groups[event.event_id] = context.state_group |