Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 12:46:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GODT-1865: fixed trailing temp file left when migrating cache.

Browse Source
This commit is contained in:
Xavier Michelon
2022-09-20 09:03:01 +02:00
parent e9616a2d3e
commit f2ef6fa12f
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/users/cache.go
View File

@ -229,18 +229,18 @@ func (u *Users) MigrateCache(srcPath, dstPath string) error {
// (read-only is conserved). Do copy instead.
tmp, err := ioutil.TempFile(srcPath, "tmp")
if err == nil {
defer func() {
tmp.Close() //nolint:errcheck,gosec
os.Remove(tmp.Name()) //nolint:errcheck,gosec
}()
if err := os.Rename(srcPath, dstPath); err == nil {
return nil
// Removal of tmp file cannot be deferred, as we are going to try to move the containing folder.
if err = tmp.Close(); err == nil {
if err = os.Remove(tmp.Name()); err == nil {
if err = os.Rename(srcPath, dstPath); err == nil {
return nil
}
}
}
} else {
logrus.WithError(err).Warn("Cannot write to source: do copy to new destination instead of rename")
}
logrus.WithError(err).Warn("Cannot write to source: do copy to new destination instead of rename")
// Rename failed let's try an actual copy/delete
if err = copyFolder(srcPath, dstPath); err != nil {
return err