summary refs log tree commit diff
path: root/synapse/handlers/federation.py
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-12-13 12:55:32 +0000
committerRichard van der Hoff <richard@matrix.org>2019-12-16 13:53:53 +0000
commit83895316d4e18d4a52c43524942d98f864bac6f9 (patch)
treeede0cb55827c18f07838ef02a57a7625e7e88f9a /synapse/handlers/federation.py
parentSanity-check room ids in event auth (#6530) (diff)
downloadsynapse-83895316d4e18d4a52c43524942d98f864bac6f9.tar.xz
sanity-checking for events used in state res (#6531)
When we perform state resolution, check that all of the events involved are in
the right room.
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r--synapse/handlers/federation.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index ebeffbb768..fd3f5ced55 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -397,6 +397,7 @@ class FederationHandler(BaseHandler):
                                 event_map[x.event_id] = x
 
                     state_map = yield resolve_events_with_store(
+                        room_id,
                         room_version,
                         state_maps,
                         event_map,