Merge pull request #5833 from ActiveState/fix_nsinit_env_panic

fix panic when passing empty environment
docker-archive · May 16, 2014 · afea8ea · afea8ea
2 parents 8f77887 + d636e8a
commit afea8ea
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/nsinit/init.go b/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
 		}