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

Merge pull request #7448 from baude/issue7444

Browse Source 
fix panic when checking len on nil object
This commit is contained in:
OpenShift Merge Robot
2020-08-28 14:15:49 -04:00
committed by GitHub
parent 522a32f827 a6f85861df
commit a5085b06a5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libpod/image/image.go
View File

@ -1246,7 +1246,12 @@ func areParentAndChild(parent, child *imgspecv1.Image) bool {
// the child and candidate parent should share all of the // the child and candidate parent should share all of the
// candidate parent's diff IDs, which together would have // candidate parent's diff IDs, which together would have
// controlled which layers were used // controlled which layers were used
if len(parent.RootFS.DiffIDs) > len(child.RootFS.DiffIDs) {
// issue #7444 describes a panic where the length of child.RootFS.DiffIDs
// is checked but child is nil. Adding a simple band-aid approach to prevent
// the problem until the origin of the problem can be worked out in the issue
// itself.
if child == nil || len(parent.RootFS.DiffIDs) > len(child.RootFS.DiffIDs) {
return false return false
} }
childUsesCandidateDiffs := true childUsesCandidateDiffs := true