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

Merge pull request #2185 from mheon/specfromstate_fix

Browse Source 
Do not unmarshal into c.config.Spec
This commit is contained in:
OpenShift Merge Robot
2019-01-18 17:10:51 +01:00
committed by GitHub
parent 7f19e5fb23 fc52b0423b
commit a2ab36d0d1
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/container.go
View File

@ -415,14 +415,15 @@ func (c *Container) Spec() *spec.Spec {
// config does not exist (e.g., because the container was never started) return // config does not exist (e.g., because the container was never started) return
// the spec from the config. // the spec from the config.
func (c *Container) specFromState() (*spec.Spec, error) { func (c *Container) specFromState() (*spec.Spec, error) {
spec := c.config.Spec returnSpec := c.config.Spec
if f, err := os.Open(c.state.ConfigPath); err == nil { if f, err := os.Open(c.state.ConfigPath); err == nil {
returnSpec = new(spec.Spec)
content, err := ioutil.ReadAll(f) content, err := ioutil.ReadAll(f)
if err != nil { if err != nil {
return nil, errors.Wrapf(err, "error reading container config") return nil, errors.Wrapf(err, "error reading container config")
} }
if err := json.Unmarshal([]byte(content), &spec); err != nil { if err := json.Unmarshal([]byte(content), &returnSpec); err != nil {
return nil, errors.Wrapf(err, "error unmarshalling container config") return nil, errors.Wrapf(err, "error unmarshalling container config")
} }
} else { } else {
@ -432,7 +433,7 @@ func (c *Container) specFromState() (*spec.Spec, error) {
} }
} }
return spec, nil return returnSpec, nil
} }
// ID returns the container's ID // ID returns the container's ID