Merge pull request #641 from kinvolk/dongsu/fix-panic-multierror

Zhou Hao · web-flow · commit e222e66c8a8c · 2018-06-04T17:27:47.000+08:00
validation: fix nil dereference when handling multierror in hooks_stdin
diff --git a/validation/hooks_stdin.go b/validation/hooks_stdin.go
@@ -151,7 +151,13 @@ func main() {
 	}
 	for _, file := range []string{"prestart", "poststart", "poststop"} {
 		errs := stdinStateCheck(outputDir, file, expectedState)
-		util.SpecErrorOK(t, errs.ErrorOrNil() == nil, specerror.NewError(specerror.PosixHooksStateToStdin, fmt.Errorf("the state of the container MUST be passed to %q hook over stdin", file), rspecs.Version), errors.New(errs.Error()))
+		var newError error
+		if errs == nil {
+			newError = errors.New("")
+		} else {
+			newError = errors.New(errs.Error())
+		}
+		util.SpecErrorOK(t, errs.ErrorOrNil() == nil, specerror.NewError(specerror.PosixHooksStateToStdin, fmt.Errorf("the state of the container MUST be passed to %q hook over stdin", file), rspecs.Version), newError)
 	}
 
 	t.AutoPlan()

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,13 @@ func main() {`
`151`	`151`	`}`
`152`	`152`	`for _, file := range []string{"prestart", "poststart", "poststop"} {`
`153`	`153`	`errs := stdinStateCheck(outputDir, file, expectedState)`
`154`		`- util.SpecErrorOK(t, errs.ErrorOrNil() == nil, specerror.NewError(specerror.PosixHooksStateToStdin, fmt.Errorf("the state of the container MUST be passed to %q hook over stdin", file), rspecs.Version), errors.New(errs.Error()))`
	`154`	`+ var newError error`
	`155`	`+ if errs == nil {`
	`156`	`+ newError = errors.New("")`
	`157`	`+ } else {`
	`158`	`+ newError = errors.New(errs.Error())`
	`159`	`+ }`
	`160`	`+ util.SpecErrorOK(t, errs.ErrorOrNil() == nil, specerror.NewError(specerror.PosixHooksStateToStdin, fmt.Errorf("the state of the container MUST be passed to %q hook over stdin", file), rspecs.Version), newError)`
`155`	`161`	`}`
`156`	`162`
`157`	`163`	`t.AutoPlan()`