erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-27 18:57:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #29628 from mehrdadbn9/fix/29627-stats-nil-pointer

Browse source 
fix(api): nil check Memory.Limit before dereference in stats handler
This commit is contained in:
Miloslav Trmač 2026-08-24 15:43:09 +02:00 • committed by GitHub
commit ca42cbff0a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/api/handlers/compat/containers_stats_linux.go
View file

@ -72,7 +72,7 @@ func statsContainerJSON(ctnr *libpod.Container, stats *define.ContainerStats, pr
resources := ctnr.LinuxResources()
memoryLimit := cgroupStat.MemoryStats.Usage.Limit
if resources != nil && resources.Memory != nil && *resources.Memory.Limit > 0 {
if resources != nil && resources.Memory != nil && resources.Memory.Limit != nil && *resources.Memory.Limit > 0 {
memoryLimit = uint64(*resources.Memory.Limit)
}

6
test/apiv2/19-stats.at
View file

@ -27,3 +27,9 @@ podman rm -f testctr2
podman network rm testnet1
podman network rm testnet2
# regression for https://github.com/containers/podman/issues/29627
# stats should not panic when memory-reservation is set without memory-limit
podman run -dt --name testctr3 --memory-reservation=10m $IMAGE top &>/dev/null
t GET libpod/containers/testctr3/stats?stream=false 200
podman rm -f testctr3