jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge branch 'pr-1752' 

cgroups/fs: fix NPE on Destroy than no cgroups are set

LGTMs: @crosbymichael @cyphar
Closes #1752
This commit is contained in:
Aleksa Sarai 2018-03-08 09:00:18 +11:00
parent 0c743bb246 3d26fc3fd7
commit 108570c6e4
No known key found for this signature in database
GPG Key ID: 9E18AA267DDB8DB4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcontainer/cgroups/fs/apply_raw.go
View File

@ -161,7 +161,7 @@ func (m *Manager) Apply(pid int) (err error) {
}
func (m *Manager) Destroy() error {
if m.Cgroups.Paths != nil {
if m.Cgroups == nil || m.Cgroups.Paths != nil {
return nil
}
m.mu.Lock()