Skip to content

Commit e1d1334

Browse files
authored
Merge pull request #1864 from joshfrench/single-optional-arg
Missing arg can cause a panic
2 parents 00e6067 + d765601 commit e1d1334

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

args.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,11 @@ func (a *ArgumentBase[T, C, VC]) Parse(s []string) ([]string, error) {
133133
}
134134

135135
if a.Max == 1 && a.Destination != nil {
136-
*a.Destination = values[0]
136+
if len(values) > 0 {
137+
*a.Destination = values[0]
138+
} else {
139+
*a.Destination = t
140+
}
137141
}
138142
return s[count:], nil
139143
}

args_test.go

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,26 @@ func TestArgsUsage(t *testing.T) {
151151
})
152152
}
153153
}
154+
155+
func TestSingleOptionalArg(t *testing.T) {
156+
cmd := buildMinimalTestCommand()
157+
var s1 string
158+
arg := &StringArg{
159+
Min: 0,
160+
Max: 1,
161+
Destination: &s1,
162+
}
163+
cmd.Arguments = []Argument{
164+
arg,
165+
}
166+
167+
require.NoError(t, cmd.Run(context.Background(), []string{"foo"}))
168+
require.Equal(t, "", s1)
169+
170+
arg.Value = "bar"
171+
require.NoError(t, cmd.Run(context.Background(), []string{"foo"}))
172+
require.Equal(t, "bar", s1)
173+
174+
require.NoError(t, cmd.Run(context.Background(), []string{"foo", "zbar"}))
175+
require.Equal(t, "zbar", s1)
176+
}

0 commit comments

Comments
 (0)