Просмотр исходного кода

Merge pull request #47734 from krissetto/image-history-timestamp-dereference

fix: avoid nil dereference on image history `Created` value
Paweł Gronowski 1 год назад
Родитель
Сommit
ee8b788538
1 измененных файлов с 6 добавлено и 1 удалено
  1. 6 1
      daemon/images/image_history.go

+ 6 - 1
daemon/images/image_history.go

@@ -43,9 +43,14 @@ func (i *ImageService) ImageHistory(ctx context.Context, name string) ([]*image.
 			layerCounter++
 			layerCounter++
 		}
 		}
 
 
+		var created int64
+		if h.Created != nil {
+			created = h.Created.Unix()
+		}
+
 		history = append([]*image.HistoryResponseItem{{
 		history = append([]*image.HistoryResponseItem{{
 			ID:        "<missing>",
 			ID:        "<missing>",
-			Created:   h.Created.Unix(),
+			Created:   created,
 			CreatedBy: h.CreatedBy,
 			CreatedBy: h.CreatedBy,
 			Comment:   h.Comment,
 			Comment:   h.Comment,
 			Size:      layerSize,
 			Size:      layerSize,