Merge pull request containerd#3835 from SpiffyEight77/fix/issue-3755

fahedouch · web-flow · commit 1e8f43bedc53 · 2025-01-26T10:08:16.000+01:00
fix: prevent panic in nydus snapshotter inspect
diff --git a/pkg/inspecttypes/dockercompat/dockercompat.go b/pkg/inspecttypes/dockercompat/dockercompat.go
@@ -340,7 +340,9 @@ func ImageFromNative(nativeImage *native.Image) (*Image, error) {
 
 	if len(imgOCI.History) > 0 {
 		image.Comment = imgOCI.History[len(imgOCI.History)-1].Comment
-		image.Created = imgOCI.History[len(imgOCI.History)-1].Created.Format(time.RFC3339Nano)
+		if !imgOCI.History[len(imgOCI.History)-1].Created.IsZero() {
+			image.Created = imgOCI.History[len(imgOCI.History)-1].Created.Format(time.RFC3339Nano)
+		}
 		image.Author = imgOCI.History[len(imgOCI.History)-1].Author
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -340,7 +340,9 @@ func ImageFromNative(nativeImage native.Image) (Image, error) {`
`340`	`340`
`341`	`341`	`if len(imgOCI.History) > 0 {`
`342`	`342`	`image.Comment = imgOCI.History[len(imgOCI.History)-1].Comment`
`343`		`- image.Created = imgOCI.History[len(imgOCI.History)-1].Created.Format(time.RFC3339Nano)`
	`343`	`+ if !imgOCI.History[len(imgOCI.History)-1].Created.IsZero() {`
	`344`	`+ image.Created = imgOCI.History[len(imgOCI.History)-1].Created.Format(time.RFC3339Nano)`
	`345`	`+ }`
`344`	`346`	`image.Author = imgOCI.History[len(imgOCI.History)-1].Author`
`345`	`347`	`}`
`346`	`348`