narayana/go-tdlib
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #60 from divinerapier/master

Browse source 
fix: time.After will cause memory leaks
This commit is contained in:
Aleksandr Zelenin 2021-09-13 17:15:36 +03:00 committed by GitHub
parent 98e8cb003f 278b1ae10d
commit e162b22637
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/client.go
View file

@ -1,6 +1,7 @@
package client package client
import ( import (
"context"
"errors" "errors"
"sync" "sync"
"time" "time"
@ -123,17 +124,20 @@ func (client *Client) Send(req Request) (*Response, error) {
client.catchersStore.Store(req.Extra, catcher) client.catchersStore.Store(req.Extra, catcher)
defer func() { defer func() {
close(catcher)
client.catchersStore.Delete(req.Extra) client.catchersStore.Delete(req.Extra)
close(catcher)
}() }()
client.jsonClient.Send(req) client.jsonClient.Send(req)
ctx, cancel := context.WithTimeout(context.Background(), client.catchTimeout)
defer cancel()
select { select {
case response := <-catcher: case response := <-catcher:
return response, nil return response, nil
case <-time.After(client.catchTimeout): case <-ctx.Done():
return nil, errors.New("response catching timeout") return nil, errors.New("response catching timeout")
} }
} }