Skip to content

Horrible fix for https://github.com/element-hq/dendrite/issues/3629 #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 15, 2025
Merged

Horrible fix for https://github.com/element-hq/dendrite/issues/3629 #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion stateresolutionv2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,10 @@ func ResolveStateConflictsV2(
}
}
if createEvent == nil {
panic("ResolveStateConflictsV2: cannot find create event in auth chain")
// FIXME TODO: We previously panicked here but this meant Dendrite would crash on startup.
// We really need to get our error handling sorted properly when doing state resolution..
// See https://github.com/element-hq/dendrite/issues/3629
return nil // we should return an error here :/
}
// Prepare the state resolver.
conflictedControlEvents := make([]PDU, 0, len(conflicted))
Expand Down
Loading