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

Fix nil pointer exception

Browse source
This commit is contained in:
Neil Alexander 2020-09-10 10:38:23 +01:00
parent 9c8cc2f34f
commit b22731cdcd
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
federationsender/internal/perform.go
View file

@ -98,7 +98,10 @@ func (r *FederationSenderInternalAPI) PerformJoin(
response.LastError = &gomatrix.HTTPError{ response.LastError = &gomatrix.HTTPError{
Code: 0, Code: 0,
WrappedError: nil, WrappedError: nil,
Message: lastErr.Error(), Message: "Unknown HTTP error",
}
if lastErr != nil {
response.LastError.Message = lastErr.Error()
} }
} }

2
roomserver/internal/perform/perform_join.go
View file

@ -192,7 +192,7 @@ func (r *Joiner) performJoinRoomByID(
serverInRoom, _ := helpers.IsServerCurrentlyInRoom(ctx, r.DB, r.ServerName, req.RoomIDOrAlias) serverInRoom, _ := helpers.IsServerCurrentlyInRoom(ctx, r.DB, r.ServerName, req.RoomIDOrAlias)
isInvitePending, inviteSender, _, err := helpers.IsInvitePending(ctx, r.DB, req.RoomIDOrAlias, req.UserID) isInvitePending, inviteSender, _, err := helpers.IsInvitePending(ctx, r.DB, req.RoomIDOrAlias, req.UserID)
if !serverInRoom || (err == nil && isInvitePending) { if !serverInRoom || (err == nil && isInvitePending) {
if inviteSender != "" { if err == nil && inviteSender != "" {
// Check if there's an invite pending. // Check if there's an invite pending.
_, inviterDomain, ierr := gomatrixserverlib.SplitID('@', inviteSender) _, inviterDomain, ierr := gomatrixserverlib.SplitID('@', inviteSender)
if ierr != nil { if ierr != nil {