Fix NPE when resolving state (#401)

matrix-org · Jul 7, 2023 · 226d208 · 226d208
1 parent 35f734f
commit 226d208
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/stateresolutionv2.go b/stateresolutionv2.go
@@ -84,6 +84,17 @@ func ResolveStateConflictsV2(
 			panic(err)
 		}
 	}
+	if len(authEvents) > 0 {
+		roomID, err = spec.NewRoomID(authEvents[0].RoomID())
+		if err != nil {
+			panic(err)
+		}
+	}
+	// If we still don't have a roomID, we don't have conflicted, unconflicted
+	// or any authEvents, which in theory shouldn't happen.
+	if roomID == nil {
+		return r.result
+	}
 
 	r.allower = newAllowerContext(&r.authProvider, userIDForSender, *roomID)