Merge pull request #1758 from ygalblum/check-report-writer

Image copier: make sure ReportWriter is not nil before accessing
containers · Dec 4, 2023 · d0a7910 · d0a7910
2 parents 630c929 + 0fdbee7
commit d0a7910
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/libimage/copier.go b/libimage/copier.go
@@ -364,11 +364,13 @@ func (c *copier) copy(ctx context.Context, source, destination types.ImageRefere
 		defer cancel()
 		defer timer.Stop()
 
-		fmt.Fprintf(c.imageCopyOptions.ReportWriter,
-			"Pulling image %s inside systemd: setting pull timeout to %s\n",
-			source.StringWithinTransport(),
-			time.Duration(numExtensions)*extension,
-		)
+		if c.imageCopyOptions.ReportWriter != nil {
+			fmt.Fprintf(c.imageCopyOptions.ReportWriter,
+				"Pulling image %s inside systemd: setting pull timeout to %s\n",
+				source.StringWithinTransport(),
+				time.Duration(numExtensions)*extension,
+			)
+		}
 
 		// From `man systemd.service(5)`:
 		//