Merge pull request #4263 from rkfg/develop

Prevent crash on pagination.
6 years ago · b9d6756b14
parent 9bccd5e472 ae19a7db8c
commit b9d6756b14
2 changed files with 2 additions and 1 deletions
--- a/changelog.d/4263.bugfix
+++ b/changelog.d/4263.bugfix
@ -0,0 +1 @@
 Prevent crash on pagination.
--- a/synapse/handlers/pagination.py
+++ b/synapse/handlers/pagination.py
@ -254,7 +254,7 @@ class PaginationHandler(object):
            })
        state = None
-        if event_filter and event_filter.lazy_load_members():
+        if event_filter and event_filter.lazy_load_members() and len(events) > 0:
            # TODO: remove redundant members
            # FIXME: we also care about invite targets etc.