yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Close connection before deleting labels to prevent panics accessing deleted bucket

Browse Source
This commit is contained in:
Michal Horejsek
2020-11-03 09:58:56 +01:00
committed by Jakub Cuth
parent f0695eb870
commit b9740e1b7d
7 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/users/user.go
View File

@ -437,7 +437,7 @@ func (u *User) SwitchAddressMode() (err error) {
u.lock.Lock()
defer u.lock.Unlock()
u.closeAllConnections()
u.CloseAllConnections()
if u.store == nil {
err = errors.New("store is not initialised")
@ -509,7 +509,7 @@ func (u *User) Logout() (err error) {
// Do not close whole store, just event loop. Some information might be needed offline (e.g. addressID)
u.closeEventLoop()
u.closeAllConnections()
u.CloseAllConnections()
runtime.GC()
@ -532,8 +532,8 @@ func (u *User) closeEventLoop() {
u.store.CloseEventLoop()
}
// closeAllConnections calls CloseConnection for all users addresses.
func (u *User) closeAllConnections() {
// CloseAllConnections calls CloseConnection for all users addresses.
func (u *User) CloseAllConnections() {
for _, address := range u.creds.EmailList() {
u.CloseConnection(address)
}