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

Fix nil pointer and goroutine safety in typing cache

Browse source 
Signed-off-by: Alex Chen <minecnly@gmail.com>
This commit is contained in:
Cnly 2019-06-25 22:45:53 +08:00
parent 55a4e6061a
commit ba35a0a96d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
typingserver/cache/cache.go vendored
View file

@ -62,11 +62,12 @@ func (t *TypingCache) GetTypingUsersIfUpdatedAfter(
roomID string, position int64, roomID string, position int64,
) (users []string, updated bool) { ) (users []string, updated bool) {
t.RLock() t.RLock()
defer t.RUnlock()
roomData, ok := t.data[roomID] roomData, ok := t.data[roomID]
userSet := roomData.userSet
t.RUnlock()
if ok && roomData.syncPosition > position { if ok && roomData.syncPosition > position {
updated = true updated = true
userSet := roomData.userSet
users = make([]string, 0, len(userSet)) users = make([]string, 0, len(userSet))
for userID := range userSet { for userID := range userSet {
users = append(users, userID) users = append(users, userID)