0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-12-15 03:23:46 +01:00

Fix data race in lookupMissingStateViaStateIDs

This commit is contained in:
Neil Alexander 2022-08-02 13:01:03 +01:00
parent 7ec70272d2
commit f4345dafde
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -750,9 +750,8 @@ func (t *missingStateReq) lookupMissingStateViaStateIDs(ctx context.Context, roo
// Define what we'll do in order to fetch the missing event ID.
fetch := func(missingEventID string) {
var h *gomatrixserverlib.Event
h, err = t.lookupEvent(ctx, roomVersion, roomID, missingEventID, false)
switch err.(type) {
h, herr := t.lookupEvent(ctx, roomVersion, roomID, missingEventID, false)
switch herr.(type) {
case verifySigError:
return
case nil:
@ -761,7 +760,7 @@ func (t *missingStateReq) lookupMissingStateViaStateIDs(ctx context.Context, roo
util.GetLogger(ctx).WithFields(logrus.Fields{
"event_id": missingEventID,
"room_id": roomID,
}).Warn("Failed to fetch missing event")
}).WithError(herr).Warn("Failed to fetch missing event")
return
}
haveEventsMutex.Lock()