fix: nil ptr deref in Run and RunCacheProbe (#295)

mafredri · johnstcn · commit 069a0aa33a44 · 2024-08-05T14:33:12.000+01:00
(cherry picked from commit df6597a)
diff --git a/envbuilder.go b/envbuilder.go
@@ -153,7 +153,7 @@ func Run(ctx context.Context, opts options.Options) error {
 				endStage("📦 Cloned repository!")
 				buildTimeWorkspaceFolder = cloneOpts.Path
 			} else {
-				opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", err.Error())
+				opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", fallbackErr.Error())
 				opts.Logger(log.LevelError, "Falling back to the default image...")
 			}
 		}
@@ -912,7 +912,7 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)
 				endStage("📦 Cloned repository!")
 				buildTimeWorkspaceFolder = cloneOpts.Path
 			} else {
-				opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", err.Error())
+				opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", fallbackErr.Error())
 				opts.Logger(log.LevelError, "Falling back to the default image...")
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ func Run(ctx context.Context, opts options.Options) error {`
`153`	`153`	`endStage("📦 Cloned repository!")`
`154`	`154`	`buildTimeWorkspaceFolder = cloneOpts.Path`
`155`	`155`	`} else {`
`156`		`- opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", err.Error())`
	`156`	`+ opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", fallbackErr.Error())`
`157`	`157`	`opts.Logger(log.LevelError, "Falling back to the default image...")`
`158`	`158`	`}`
`159`	`159`	`}`
`@@ -912,7 +912,7 @@ func RunCacheProbe(ctx context.Context, opts options.Options) (v1.Image, error)`
`912`	`912`	`endStage("📦 Cloned repository!")`
`913`	`913`	`buildTimeWorkspaceFolder = cloneOpts.Path`
`914`	`914`	`} else {`
`915`		`- opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", err.Error())`
	`915`	`+ opts.Logger(log.LevelError, "Failed to clone repository for remote repo mode: %s", fallbackErr.Error())`
`916`	`916`	`opts.Logger(log.LevelError, "Falling back to the default image...")`
`917`	`917`	`}`
`918`	`918`	`}`