vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #5833 from ActiveState/fix_nsinit_env_panic

Browse source 
fix panic when passing empty environment
This commit is contained in:
Michael Crosby 2014-05-16 12:03:26 -07:00
commit 724c84c6fc
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libcontainer/nsinit/init.go
View file

@ -152,6 +152,9 @@ func LoadContainerEnvironment(container *libcontainer.Container) error {
os.Clearenv() os.Clearenv()
for _, pair := range container.Env { for _, pair := range container.Env {
p := strings.SplitN(pair, "=", 2) 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 { if err := os.Setenv(p[0], p[1]); err != nil {
return err return err
} }