Add nil pointer check in dispatchWorkdir

gabriel-samfira · gabriel-samfira · commit fbbaa39c53b3 · 2023-07-03T08:11:52.000-07:00
Signed-off-by: Gabriel Adrian Samfira &lt;gsamfira@cloudbasesolutions.com&gt;
diff --git a/frontend/dockerfile/dockerfile2llb/convert.go b/frontend/dockerfile/dockerfile2llb/convert.go
@@ -995,7 +995,11 @@ func dispatchRun(d *dispatchState, c *instructions.RunCommand, proxy *llb.ProxyE
 }
 
 func dispatchWorkdir(d *dispatchState, c *instructions.WorkdirCommand, commit bool, opt *dispatchOpt) error {
-	wd, err := system.NormalizeWorkdir(d.image.Config.WorkingDir, c.Path, d.platform.OS)
+	platformOS := runtime.GOOS
+	if d.platform != nil {
+		platformOS = d.platform.OS
+	}
+	wd, err := system.NormalizeWorkdir(d.image.Config.WorkingDir, c.Path, platformOS)
 	if err != nil {
 		return errors.Wrap(err, "normalizing workdir")
 	}

Original file line number	Diff line number	Diff line change
`@@ -995,7 +995,11 @@ func dispatchRun(d dispatchState, c instructions.RunCommand, proxy *llb.ProxyE`
`995`	`995`	`}`
`996`	`996`
`997`	`997`	`func dispatchWorkdir(d dispatchState, c instructions.WorkdirCommand, commit bool, opt *dispatchOpt) error {`
`998`		`- wd, err := system.NormalizeWorkdir(d.image.Config.WorkingDir, c.Path, d.platform.OS)`
	`998`	`+ platformOS := runtime.GOOS`
	`999`	`+ if d.platform != nil {`
	`1000`	`+ platformOS = d.platform.OS`
	`1001`	`+ }`
	`1002`	`+ wd, err := system.NormalizeWorkdir(d.image.Config.WorkingDir, c.Path, platformOS)`
`999`	`1003`	`if err != nil {`
`1000`	`1004`	`return errors.Wrap(err, "normalizing workdir")`
`1001`	`1005`	`}`