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

Fix potential connection leak

Browse source
This commit is contained in:
Till Faelligen 2023-10-26 15:24:35 +02:00
parent 317b1018a3
commit a3d9b537ef
No known key found for this signature in database
GPG key ID: ACCDC9606D472758
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
roomserver/internal/perform/perform_invite.go
View file

@ -20,6 +20,7 @@ import (
"fmt"
federationAPI "github.com/matrix-org/dendrite/federationapi/api"
"github.com/matrix-org/dendrite/internal/sqlutil"
"github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/dendrite/roomserver/internal/helpers"
"github.com/matrix-org/dendrite/roomserver/internal/input"
@ -108,6 +109,8 @@ func (r *Inviter) ProcessInviteMembership(
if updater, err = r.DB.MembershipUpdater(ctx, inviteEvent.RoomID().String(), *inviteEvent.StateKey(), isTargetLocal, inviteEvent.Version()); err != nil {
return nil, fmt.Errorf("r.DB.MembershipUpdater: %w", err)
}
var succeeded bool
defer sqlutil.EndTransactionWithCheck(updater, &succeeded, &err)
outputUpdates, err = helpers.UpdateToInviteMembership(updater, &types.Event{
EventNID: 0,
PDU: inviteEvent.PDU,
@ -115,9 +118,7 @@ func (r *Inviter) ProcessInviteMembership(
if err != nil {
return nil, fmt.Errorf("updateToInviteMembership: %w", err)
}
if err = updater.Commit(); err != nil {
return nil, fmt.Errorf("updater.Commit: %w", err)
}
succeeded = true
return outputUpdates, nil
}