summaryrefslogtreecommitdiffstats
path: root/modules/util
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-05-08 16:46:05 +0100
committerGitHub <noreply@github.com>2020-05-08 16:46:05 +0100
commitc58bc4bf804a3e8f92dd634974ed4f636893c9c1 (patch)
tree75c4fa7e64a8841845cdf011f67b1e89824c3c6e /modules/util
parent6f6edb8fab5550a879a09af9530dd10d5c8d7f6d (diff)
downloadgitea-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/util')
-rw-r--r--modules/util/timer.go21
1 files changed, 21 insertions, 0 deletions
diff --git a/modules/util/timer.go b/modules/util/timer.go
new file mode 100644
index 0000000000..b682f376d9
--- /dev/null
+++ b/modules/util/timer.go
@@ -0,0 +1,21 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package util
+
+import (
+ "time"
+)
+
+// StopTimer is a utility function to safely stop a time.Timer and clean its channel
+func StopTimer(t *time.Timer) bool {
+ stopped := t.Stop()
+ if !stopped {
+ select {
+ case <-t.C:
+ default:
+ }
+ }
+ return stopped
+}