From 298182f68c66c05229eb03ac171abe6e309ee79a Mon Sep 17 00:00:00 2001 From: Oren Shomron Date: Fri, 31 Aug 2018 11:14:32 -0400 Subject: Fix panic when parsing unknown flag followed by empty argument (#173) Signed-off-by: Oren Shomron --- flag.go | 7 +++++-- flag_test.go | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/flag.go b/flag.go index 5cc710c..9beeda8 100644 --- a/flag.go +++ b/flag.go @@ -925,13 +925,16 @@ func stripUnknownFlagValue(args []string) []string { } first := args[0] - if first[0] == '-' { + if len(first) > 0 && first[0] == '-' { //--unknown --next-flag ... return args } //--unknown arg ... (args will be arg ...) - return args[1:] + if len(args) > 1 { + return args[1:] + } + return nil } func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []string, err error) { diff --git a/flag_test.go b/flag_test.go index f600f0a..7d02dbc 100644 --- a/flag_test.go +++ b/flag_test.go @@ -431,6 +431,11 @@ func testParseWithUnknownFlags(f *FlagSet, t *testing.T) { "--unknown8=unknown8value", "--boole", "--unknown6", + "", + "-uuuuu", + "", + "--unknown10", + "--unknown11", } want := []string{ "boola", "true", -- cgit v1.2.3