Fixups to element-hq#17064 (element-hq#17065)

Forget a line, and an empty batch is trivially linear. c.f. element-hq#17064
hughns · Apr 9, 2024 · 0bdae00 · 0bdae00
1 parent 172346d
commit 0bdae00
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/17065.bugfix b/changelog.d/17065.bugfix
@@ -0,0 +1 @@
+Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
@@ -1272,8 +1272,11 @@ async def _compute_state_delta_for_incremental_sync(
             for e in batch.events[1:]:
                 if e.prev_event_ids() != [prev_event_id]:
                     break
+                prev_event_id = e.event_id
             else:
                 is_linear_timeline = True
+        else:
+            is_linear_timeline = True
 
         if is_linear_timeline and not batch.limited:
             state_ids: StateMap[str] = {}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix various long-standing bugs which could cause incorrect state to be returned from `/sync` in certain situations.