Merge pull request docker#10250 from ndeloof/nil_build_args

glours · web-flow · commit 7daa2a5325c2 · 2023-02-07T21:13:29.000+01:00
prevent assignment to entry in nil map
diff --git a/pkg/compose/build.go b/pkg/compose/build.go
@@ -303,10 +303,10 @@ func (s *composeService) toBuildOptions(project *types.Project, service types.Se
 }
 
 func flatten(in types.MappingWithEquals) types.Mapping {
+	out := types.Mapping{}
 	if len(in) == 0 {
-		return nil
+		return out
 	}
-	out := types.Mapping{}
 	for k, v := range in {
 		if v == nil {
 			continue

Original file line number	Diff line number	Diff line change
`@@ -303,10 +303,10 @@ func (s composeService) toBuildOptions(project types.Project, service types.Se`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`func flatten(in types.MappingWithEquals) types.Mapping {`
	`306`	`+ out := types.Mapping{}`
`306`	`307`	`if len(in) == 0 {`
`307`		`- return nil`
	`308`	`+ return out`
`308`	`309`	`}`
`309`		`- out := types.Mapping{}`
`310`	`310`	`for k, v := range in {`
`311`	`311`	`if v == nil {`
`312`	`312`	`continue`