rev-parse: fix potential bus error with --parseopt option spec handling

jaysoffian · gitster · commit e10334364418 · 2008-02-25T21:40:12.000-08:00
A non-empty line containing no spaces should be treated by --parseopt as
an option group header, but was causing a bus error. Also added a test
script for rev-parse --parseopt.

Signed-off-by: Jay Soffian &lt;jaysoffian@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
@@ -315,7 +315,7 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 		s = strchr(sb.buf, ' ');
 		if (!s || *sb.buf == ' ') {
 			o->type = OPTION_GROUP;
-			o->help = xstrdup(skipspaces(s));
+			o->help = xstrdup(skipspaces(sb.buf));
 			continue;
 		}
 
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+test_description='test git rev-parse --parseopt'
+. ./test-lib.sh
+
+cat > expect.err <<EOF
+usage: some-command [options] <args>...
+    
+    some-command does foo and bar!
+
+    -h, --help            show the help
+    --foo                 some nifty option --foo
+    --bar ...             some cool option --bar with an argument
+
+An option group Header
+    -C [...]              option C with an optional argument
+
+Extras
+    --extra1              line above used to cause a segfault but no longer does
+
+EOF
+
+test_expect_success 'test --parseopt help output' '
+	git rev-parse --parseopt -- -h 2> output.err <<EOF
+some-command [options] <args>...
+
+some-command does foo and bar!
+--
+h,help    show the help
+
+foo       some nifty option --foo
+bar=      some cool option --bar with an argument
+
+ An option group Header
+C?        option C with an optional argument
+
+Extras
+extra1    line above used to cause a segfault but no longer does
+EOF
+	git diff expect.err output.err
+'
+
+test_done

Original file line number	Diff line number	Diff line change
`@@ -315,7 +315,7 @@ static int cmd_parseopt(int argc, const char *argv, const char prefix)`
`315`	`315`	`s = strchr(sb.buf, ' ');`
`316`	`316`	`if (!s \|\| *sb.buf == ' ') {`
`317`	`317`	`o->type = OPTION_GROUP;`
`318`		`- o->help = xstrdup(skipspaces(s));`
	`318`	`+ o->help = xstrdup(skipspaces(sb.buf));`
`319`	`319`	`continue;`
`320`	`320`	`}`
`321`	`321`