char
/
dendrite
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prevent panic in membership updater (#1021)

main
Neil Alexander 2020-05-11 18:21:25 +01:00 committed by GitHub
parent 99e0a7dff2
commit 0c892d59fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
roomserver/internal/input_membership.go
View File

@ -16,6 +16,7 @@ package internal
import ( import (
"context" "context"
"errors"
"fmt" "fmt"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
@ -106,6 +107,13 @@ func updateMembership(
return updates, nil return updates, nil
} }
if add == nil {
// This shouldn't happen. Returning an error here is better than panicking
// in the membership updater functions later on.
// TODO: Why does this happen to begin with?
return updates, errors.New("add should not be nil")
}
mu, err := updater.MembershipUpdater(targetUserNID) mu, err := updater.MembershipUpdater(targetUserNID)
if err != nil { if err != nil {
return nil, err return nil, err