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

specgen/generate: Avoid a nil dereference in MakePod

Browse Source 
The value of p.PodSpecGen.InfraContainerSpec.ResourceLimits can be nil
on FreeBSD.

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>
This commit is contained in:
Doug Rabson
2022-10-02 08:13:19 +01:00
parent e187b9711d
commit c35a70d211
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/specgen/generate/pod_create.go
View File

@ -49,10 +49,10 @@ func MakePod(p *entities.PodSpec, rt *libpod.Runtime) (*libpod.Pod, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if p.PodSpecGen.InfraContainerSpec.ResourceLimits.BlockIO != nil { if p.PodSpecGen.InfraContainerSpec.ResourceLimits != nil &&
p.PodSpecGen.InfraContainerSpec.ResourceLimits.BlockIO != nil {
p.PodSpecGen.ResourceLimits.BlockIO = p.PodSpecGen.InfraContainerSpec.ResourceLimits.BlockIO p.PodSpecGen.ResourceLimits.BlockIO = p.PodSpecGen.InfraContainerSpec.ResourceLimits.BlockIO
} }
err = specgen.WeightDevices(p.PodSpecGen.InfraContainerSpec) err = specgen.WeightDevices(p.PodSpecGen.InfraContainerSpec)
if err != nil { if err != nil {
return nil, err return nil, err