Merge pull request containerd#388 from runcom/must-bundle-path

estesp · web-flow · commit 58640c9603fe · 2016-12-16T12:07:29.000-05:00
execution/oci: validate bundle path
diff --git a/execution/executors/oci/oci.go b/execution/executors/oci/oci.go
@@ -37,6 +37,9 @@ type OCIRuntime struct {
 }
 
 func (r *OCIRuntime) Create(ctx context.Context, id string, o execution.CreateOpts) (container *execution.Container, err error) {
+	if o.Bundle == "" {
+		return nil, errors.New("bundle path cannot be an empty string")
+	}
 	oio, err := newOIO(o.Stdin, o.Stdout, o.Stderr, o.Console)
 	if err != nil {
 		return nil, err

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,9 @@ type OCIRuntime struct {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func (r OCIRuntime) Create(ctx context.Context, id string, o execution.CreateOpts) (container execution.Container, err error) {`
	`40`	`+ if o.Bundle == "" {`
	`41`	`+ return nil, errors.New("bundle path cannot be an empty string")`
	`42`	`+ }`
`40`	`43`	`oio, err := newOIO(o.Stdin, o.Stdout, o.Stderr, o.Console)`
`41`	`44`	`if err != nil {`
`42`	`45`	`return nil, err`