Skip to content
This repository has been archived by the owner on Nov 25, 2024. It is now read-only.

Fix panic in AddState #2036

Merged
merged 1 commit into from
Nov 2, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion roomserver/storage/shared/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,21 @@ func (d *Database) AddState(
if berr != nil {
return 0, fmt.Errorf("d.StateBlockTable.BulkSelectStateBlockEntries: %w", berr)
}
var found bool
for i := len(state) - 1; i >= 0; i-- {
found = false
for _, events := range blocks {
for _, event := range events {
if state[i].EventNID == event {
state = append(state[:i], state[i+1:]...)
found = true
break
}
}
}
if found {
state = append(state[:i], state[i+1:]...)
i--
}
}
}
err = d.Writer.Do(d.DB, nil, func(txn *sql.Tx) error {
Expand Down