[PATCH 13/14] diff_opt_parse(): use convert_i() when handling "-l<num>"
From: Michael Haggerty <hidden>
Date: 2016-06-15 23:04:11
Subsystem:
the rest · Maintainer:
Linus Torvalds
die() with an error message if the argument is not a non-negative integer. This change tightens up parsing: '+' and '-', leading whitespace, and trailing junk are all disallowed now. Signed-off-by: Michael Haggerty <redacted> --- diff.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index bc1e3c3..be389ae 100644
--- a/diff.c
+++ b/diff.c@@ -3799,7 +3799,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) else if (!strcmp(arg, "-z")) options->line_termination = 0; else if ((argcount = short_opt('l', av, &optarg))) { - options->rename_limit = strtoul(optarg, NULL, 10); + if (convert_i(optarg, 10, &options->rename_limit)) + die("-l requires a non-negative integer argument"); return argcount; } else if ((argcount = short_opt('S', av, &optarg))) {
--
2.1.4