Horrible fix for element-hq/dendrite#3629 (#460)

kegsay · web-flow · commit 6697d93cbcba · 2025-08-15T07:58:06.000+01:00
### Pull Request Checklist * [x] Pull request includes a [sign off](https://github.com/matrix-org/dendrite/blob/master/docs/CONTRIBUTING.md#sign-off) Signed-off-by: `Your Name <your@email.example.org>`
diff --git a/stateresolutionv2.go b/stateresolutionv2.go
@@ -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))

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,10 @@ func ResolveStateConflictsV2(`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`if createEvent == nil {`
`77`		`- panic("ResolveStateConflictsV2: cannot find create event in auth chain")`
	`77`	`+ // FIXME TODO: We previously panicked here but this meant Dendrite would crash on startup.`
	`78`	`+ // We really need to get our error handling sorted properly when doing state resolution..`
	`79`	`+ // See https://github.com/element-hq/dendrite/issues/3629`
	`80`	`+ return nil // we should return an error here :/`
`78`	`81`	`}`
`79`	`82`	`// Prepare the state resolver.`
`80`	`83`	`conflictedControlEvents := make([]PDU, 0, len(conflicted))`