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
committerGitHub <noreply@github.com>2019-12-13 12:55:32 +0000
commit1da15f05f5c9c1e47c9fd1323caff869c2e55aa3 (patch)
treeda97cc9f597b09e5dd6a05bb5594d8288385277b /synapse/handlers/federation.py
parentSanity-check room ids in event auth (#6530) (diff)
downloadsynapse-1da15f05f5c9c1e47c9fd1323caff869c2e55aa3.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 2ea69c5468..1d39a9a4f5 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -396,6 +396,7 @@ class FederationHandler(BaseHandler):
                                 event_map[x.event_id] = x
 
                     state_map = await resolve_events_with_store(
+                        room_id,
                         room_version,
                         state_maps,
                         event_map,