Fix panic when parsing unknown flag followed by empty argument (#173)

Signed-off-by: Oren Shomron <shomron@gmail.com>
spf13 · Aug 31, 2018 · 298182f · 298182f
1 parent d929dcb
commit 298182f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git 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
@@ -431,6 +431,11 @@ func testParseWithUnknownFlags(f *FlagSet, t *testing.T) {
 		"--unknown8=unknown8value",
 		"--boole",
 		"--unknown6",
+		"",
+		"-uuuuu",
+		"",
+		"--unknown10",
+		"--unknown11",
 	}
 	want := []string{
 		"boola", "true",