aboutsummaryrefslogtreecommitdiff
path: root/models
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-06-11 02:28:08 -0400
committerUnknwon <u@gogs.io>2017-06-11 02:28:08 -0400
commit23b83cb73669c98e66095aee2c37ac9d0cf97162 (patch)
tree43f6d6b60017b4a9893e51c8146d22d58d1c3a91 /models
parente16196124eff47924691b3e5c70c6f4d5dcca9b1 (diff)
pkg/process: fix potential race condition
Following conditions were not protected: 1. Use and increase next pid 2. Append and remove process from the list
Diffstat (limited to 'models')
-rw-r--r--models/action.go2
-rw-r--r--models/ssh_key.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/models/action.go b/models/action.go
index 1715c05a..8b15f1cf 100644
--- a/models/action.go
+++ b/models/action.go
@@ -75,7 +75,7 @@ type Action struct {
ID int64
UserID int64 // Receiver user ID
OpType ActionType
- ActUserID int64 // Doer user OD
+ ActUserID int64 // Doer user ID
ActUserName string // Doer user name
ActAvatar string `xorm:"-"`
RepoID int64 `xorm:"INDEX"`
diff --git a/models/ssh_key.go b/models/ssh_key.go
index 798c58f2..00dc1af7 100644
--- a/models/ssh_key.go
+++ b/models/ssh_key.go
@@ -289,7 +289,7 @@ func CheckPublicKeyString(content string) (_ string, err error) {
return "", errors.New("only a single line with a single key please")
}
- // remove any unnecessary whitespace now
+ // Remove any unnecessary whitespace
content = strings.TrimSpace(content)
if !setting.SSH.MinimumKeySizeCheck {
Powered by cgit, Themed by Ted Yin.