merge branch 'pr-1752'

cyphar · cyphar · commit 108570c6e4f3 · 2018-03-08T09:00:18.000+11:00
cgroups/fs: fix NPE on Destroy than no cgroups are set LGTMs: @crosbymichael @cyphar Closes #1752
diff --git a/libcontainer/cgroups/fs/apply_raw.go b/libcontainer/cgroups/fs/apply_raw.go
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,7 @@ func (m *Manager) Apply(pid int) (err error) {`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`func (m *Manager) Destroy() error {`
`164`		`- if m.Cgroups.Paths != nil {`
	`164`	`+ if m.Cgroups == nil \|\| m.Cgroups.Paths != nil {`
`165`	`165`	`return nil`
`166`	`166`	`}`
`167`	`167`	`m.mu.Lock()`