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 /cmd/hook.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 'cmd/hook.go')
| -rw-r--r-- | cmd/hook.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/cmd/hook.go b/cmd/hook.go index 331f6a2d2d..fa932087fe 100644 --- a/cmd/hook.go +++ b/cmd/hook.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/private" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" "github.com/urfave/cli" ) @@ -113,15 +114,8 @@ func (d *delayWriter) Close() error { if d == nil { return nil } - stopped := d.timer.Stop() - if stopped { - return nil - } - select { - case <-d.timer.C: - default: - } - if d.buf == nil { + stopped := util.StopTimer(d.timer) + if stopped || d.buf == nil { return nil } _, err := d.internal.Write(d.buf.Bytes()) |