Alexander/gomuks
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix potential double locking when finding shared rooms

Browse Source
This commit is contained in:
Tulir Asokan
2020-05-06 18:43:35 +03:00
parent 5927733562
commit 4052ec532b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
matrix/rooms/roomcache.go
View File

@@ -74,6 +74,8 @@ func (cache *RoomCache) IsEncrypted(roomID id.RoomID) bool {
} }
func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) { func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) {
// FIXME this disables unloading so TouchNode wouldn't try to double-lock
cache.DisableUnloading()
cache.Lock() cache.Lock()
for _, room := range cache.Map { for _, room := range cache.Map {
if !room.Encrypted { if !room.Encrypted {
@@ -85,6 +87,7 @@ func (cache *RoomCache) FindSharedRooms(userID id.UserID) (shared []id.RoomID) {
} }
} }
cache.Unlock() cache.Unlock()
cache.EnableUnloading()
return return
} }