Merge pull request #1826 from jingxiaolu/fix_specconv_process_nil

Mrunal Patel · web-flow · commit 3087d43bc8c5 · 2020-03-23T21:07:06.000-07:00
specconv: fix null spec.Process making runc panic
diff --git a/libcontainer/specconv/spec_linux_test.go b/libcontainer/specconv/spec_linux_test.go
@@ -585,3 +585,16 @@ func TestInitSystemdProps(t *testing.T) {
 		}
 	}
 }
+
+func TestNullProcess(t *testing.T) {
+	spec := Example()
+	spec.Process = nil
+
+	_, err := CreateLibcontainerConfig(&CreateOpts{
+		Spec: spec,
+	})
+
+	if err != nil {
+		t.Errorf("Null process should be forbidden")
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -585,3 +585,16 @@ func TestInitSystemdProps(t *testing.T) {`
`585`	`585`	`}`
`586`	`586`	`}`
`587`	`587`	`}`
	`588`	`+`
	`589`	`+func TestNullProcess(t *testing.T) {`
	`590`	`+ spec := Example()`
	`591`	`+ spec.Process = nil`
	`592`	`+`
	`593`	`+ _, err := CreateLibcontainerConfig(&CreateOpts{`
	`594`	`+ Spec: spec,`
	`595`	`+ })`
	`596`	`+`
	`597`	`+ if err != nil {`
	`598`	`+ t.Errorf("Null process should be forbidden")`
	`599`	`+ }`
	`600`	`+}`