opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2656 from giuseppe/fix-rootfs-segfault

Browse Source 
container: check containerInfo.Config before accessing it
This commit is contained in:
OpenShift Merge Robot
2019-03-15 04:52:33 -07:00
committed by GitHub
parent 39859850ae 508e08410b
commit f4c41961e3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/container_internal.go
View File

@ -337,12 +337,14 @@ func (c *Container) setupStorage(ctx context.Context) error {
} }
// Set the default Entrypoint and Command // Set the default Entrypoint and Command
if containerInfo.Config != nil {
if c.config.Entrypoint == nil { if c.config.Entrypoint == nil {
c.config.Entrypoint = containerInfo.Config.Config.Entrypoint c.config.Entrypoint = containerInfo.Config.Config.Entrypoint
} }
if c.config.Command == nil { if c.config.Command == nil {
c.config.Command = containerInfo.Config.Config.Cmd c.config.Command = containerInfo.Config.Config.Cmd
} }
}
artifacts := filepath.Join(c.config.StaticDir, artifactsDir) artifacts := filepath.Join(c.config.StaticDir, artifactsDir)
if err := os.MkdirAll(artifacts, 0755); err != nil { if err := os.MkdirAll(artifacts, 0755); err != nil {