mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-12 01:13:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite loop when printing unknownRoomError

Browse source
This commit is contained in:
Mark Haines 2017-06-07 14:22:14 +01:00
parent 6b86a48a81
commit 64ce8978dc
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/github.com/matrix-org/dendrite/federationapi/writers/send.go
View file

@ -111,9 +111,11 @@ func (t *txnReq) processTransaction() (*gomatrixserverlib.RespSend, error) {
return &gomatrixserverlib.RespSend{PDUs: results}, nil return &gomatrixserverlib.RespSend{PDUs: results}, nil
} }
type unknownRoomError string type unknownRoomError struct {
roomID string
}
func (e unknownRoomError) Error() string { return fmt.Sprintf("unknown room %q", e) } func (e unknownRoomError) Error() string { return fmt.Sprintf("unknown room %q", e.roomID) }
func (t *txnReq) processEvent(e gomatrixserverlib.Event) error { func (t *txnReq) processEvent(e gomatrixserverlib.Event) error {
refs := e.PrevEvents() refs := e.PrevEvents()
@ -141,7 +143,7 @@ func (t *txnReq) processEvent(e gomatrixserverlib.Event) error {
// that this server is unaware of. // that this server is unaware of.
// However generally speaking we should reject events for rooms we // However generally speaking we should reject events for rooms we
// aren't a member of. // aren't a member of.
return unknownRoomError(e.RoomID()) return unknownRoomError{e.RoomID()}
} }
if !stateResp.PrevEventsExist { if !stateResp.PrevEventsExist {