Browse Source

Merge pull request #5833 from ActiveState/fix_nsinit_env_panic

fix panic when passing empty environment
Michael Crosby 11 years ago
parent
commit
62c3183fc8
1 changed files with 3 additions and 0 deletions
  1. 3 0
      pkg/libcontainer/nsinit/init.go

+ 3 - 0
pkg/libcontainer/nsinit/init.go

@@ -152,6 +152,9 @@ func LoadContainerEnvironment(container *libcontainer.Container) error {
 	os.Clearenv()
 	for _, pair := range container.Env {
 		p := strings.SplitN(pair, "=", 2)
+		if len(p) < 2 {
+			return fmt.Errorf("invalid environment '%v'", pair)
+		}
 		if err := os.Setenv(p[0], p[1]); err != nil {
 			return err
 		}