Skip to content

fix: handle missing DiffIDs in tarball Manifest() to prevent panic #2263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yanhu007 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: handle missing DiffIDs in tarball Manifest() to prevent panic #2263

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions pkg/v1/tarball/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,25 @@ func (c *compressedImage) Manifest() (*v1.Manifest, error) {
if err != nil {
return nil, err
}
if i >= len(cfg.RootFS.DiffIDs) {
// Config formats like buildkit cacheconfig don't have DiffIDs.
// Fall through to read the layer from the tar directly.
l, err := extractFileFromTar(c.opener, p)
if err != nil {
return nil, err
}
defer l.Close()
sha, size, err := v1.SHA256(l)
if err != nil {
return nil, err
}
c.manifest.Layers = append(c.manifest.Layers, v1.Descriptor{
MediaType: types.DockerLayer,
Size: size,
Digest: sha,
})
continue
}
diffid := cfg.RootFS.DiffIDs[i]
if d, ok := c.imgDescriptor.LayerSources[diffid]; ok {
// If it's a foreign layer, just append the descriptor so we can avoid
Expand Down
Loading