[PATCH] diff: parse ws-error-highlight option more strictly
From: René Scharfe <hidden>
Date: 2016-06-15 23:05:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
Check if a matched token is followed by a delimiter before advancing the pointer arg. This avoids accepting composite words like "allnew" or "defaultcontext". Signed-off-by: Rene Scharfe <redacted> --- diff.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index 87b16d5..0f17ec5 100644
--- a/diff.c
+++ b/diff.c@@ -3653,7 +3653,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)
--
2.4.4