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

Merge pull request #12936 from cgwalters/null-history

Browse Source 
Don't segfault if an image layer has no creation timestamp
This commit is contained in:
OpenShift Merge Robot
2022-01-21 04:17:25 -05:00
committed by GitHub
parent 993c072029 2947ded7a8
commit 845256bdb3
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/domain/infra/abi/images.go
View File

@ -94,7 +94,9 @@ func (ir *ImageEngine) Prune(ctx context.Context, opts entities.ImagePruneOption
func toDomainHistoryLayer(layer *libimage.ImageHistory) entities.ImageHistoryLayer {
l := entities.ImageHistoryLayer{}
l.ID = layer.ID
l.Created = *layer.Created
if layer.Created != nil {
l.Created = *layer.Created
}
l.CreatedBy = layer.CreatedBy
copy(l.Tags, layer.Tags)
l.Size = layer.Size

17
pkg/domain/infra/abi/images_test.go
View File

@ -1,5 +1,22 @@
package abi
import (
"testing"
"github.com/containers/common/libimage"
"github.com/stretchr/testify/assert"
)
// This is really intended to verify what happens with a
// nil pointer in layer.Created, but we'll just sanity
// check round tripping 42.
func TestToDomainHistoryLayer(t *testing.T) {
var layer libimage.ImageHistory
layer.Size = 42
newLayer := toDomainHistoryLayer(&layer)
assert.Equal(t, layer.Size, newLayer.Size)
}
//
// import (
// "context"