diff: parse ws-error-highlight option more strictly

rscharfe · gitster · commit 3f4f17b51b30 · 2015-07-12T09:55:23.000-07:00
Check if a matched token is followed by a delimiter before advancing the
pointer arg.  This avoids accepting composite words like "allnew" or
"defaultcontext" and misparsing them as "new" or "context".

Signed-off-by: Rene Scharfe &lt;l.s.r@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diff.c b/diff.c
@@ -3654,7 +3654,12 @@ static void enable_patch_output(int *fmt) {
 
 static int parse_one_token(const char **arg, const char *token)
 {
-	return skip_prefix(*arg, token, arg) && (!**arg || **arg == ',');
+	const char *rest;
+	if (skip_prefix(*arg, token, &rest) && (!*rest || *rest == ',')) {
+		*arg = rest;
+		return 1;
+	}
+	return 0;
 }
 
 static int parse_ws_error_highlight(struct diff_options *opt, const char *arg)

Original file line number	Diff line number	Diff line change
`@@ -3654,7 +3654,12 @@ static void enable_patch_output(int *fmt) {`
`3654`	`3654`
`3655`	`3655`	`static int parse_one_token(const char *arg, const char token)`
`3656`	`3656`	`{`
`3657`		`- return skip_prefix(arg, token, arg) && (!arg \|\| *arg == ',');`
	`3657`	`+ const char *rest;`
	`3658`	`+ if (skip_prefix(arg, token, &rest) && (!rest \|\| *rest == ',')) {`
	`3659`	`+ *arg = rest;`
	`3660`	`+ return 1;`
	`3661`	`+ }`
	`3662`	`+ return 0;`
`3658`	`3663`	`}`
`3659`	`3664`
`3660`	`3665`	`static int parse_ws_error_highlight(struct diff_options opt, const char arg)`