tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9592 from nicksieger/fix-panic-empty-string-arg 

fix: panic caused by empty string argument
This commit is contained in:
Nick Sieger 2022-06-28 14:07:04 -05:00 committed by GitHub
parent cc2dc868c2 fd5e8b8c28
commit 391d2e02ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/compatibility/convert.go
View File

@ -50,7 +50,7 @@ func Convert(args []string) []string {
l := len(args) l := len(args)
for i := 0; i < l; i++ { for i := 0; i < l; i++ {
arg := args[i] arg := args[i]
if arg[0] != '-' { if len(arg) > 0 && arg[0] != '-' {
// not a top-level flag anymore, keep the rest of the command unmodified // not a top-level flag anymore, keep the rest of the command unmodified
if arg == compose.PluginName { if arg == compose.PluginName {
i++ i++

5
cmd/compatibility/convert_test.go
View File

@ -68,6 +68,11 @@ func Test_convert(t *testing.T) {
args: []string{"--log-level", "INFO", "up"}, args: []string{"--log-level", "INFO", "up"},
want: []string{"--log-level", "INFO", "compose", "up"}, want: []string{"--log-level", "INFO", "compose", "up"},
}, },
{
name: "empty string argument",
args: []string{"--project-directory", "", "ps"},
want: []string{"compose", "--project-directory", "", "ps"},
},
} }
for _, tt := range tests { for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) { t.Run(tt.name, func(t *testing.T) {