diff options
| author | zeripath <art27@cantab.net> | 2020-05-08 16:46:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-08 16:46:05 +0100 |
| commit | c58bc4bf804a3e8f92dd634974ed4f636893c9c1 (patch) | |
| tree | 75c4fa7e64a8841845cdf011f67b1e89824c3c6e /modules/migrations/github.go | |
| parent | 6f6edb8fab5550a879a09af9530dd10d5c8d7f6d (diff) | |
| download | gitea-c58bc4bf804a3e8f92dd634974ed4f636893c9c1.tar.gz gitea-c58bc4bf804a3e8f92dd634974ed4f636893c9c1.zip | |
Prevent timer leaks in Workerpool and others (#11333)
There is a potential memory leak in `Workerpool` due to the intricacies of
`time.Timer` stopping.
Whenever a `time.Timer` is `Stop`ped its channel must be cleared using a
`select` if the result of the `Stop()` is `false`.
Unfortunately in `Workerpool` these were checked the wrong way round.
However, there were a few other places that were not being checked.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'modules/migrations/github.go')
| -rw-r--r-- | modules/migrations/github.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/migrations/github.go b/modules/migrations/github.go index 488cd82f5b..b6bdab09f4 100644 --- a/modules/migrations/github.go +++ b/modules/migrations/github.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/migrations/base" "code.gitea.io/gitea/modules/structs" + "code.gitea.io/gitea/modules/util" "github.com/google/go-github/v24/github" "golang.org/x/oauth2" @@ -121,7 +122,7 @@ func (g *GithubDownloaderV3) sleep() { timer := time.NewTimer(time.Until(g.rate.Reset.Time)) select { case <-g.ctx.Done(): - timer.Stop() + util.StopTimer(timer) return case <-timer.C: } |