stat_opt: check extra strlen call
As in earlier commits, the diff option parser uses starts_with to find that an argument starts with "--stat-", and then adds strlen("stat-") to find the rest of the option. However, in this case the starts_with and the strlen are separated across functions, making it easy to call the latter without the former. Let's use skip_prefix instead of raw pointer arithmetic to catch such a case. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Jun 18, 2014 at 15:51 UTC
0539cc0038ff3411da1fea342b7d6615643bff5b
1 file changed
+2
-1
diff.c
+2
-1
@@ -3422,7 +3422,8 @@ static int stat_opt(struct diff_options *options, const char **av)
3422
int count = options->stat_count;
3423
int argcount = 1;
3424
3425
- arg += strlen("--stat");
3425
+ if (!skip_prefix(arg, "--stat", &arg))
3426
+ die("BUG: stat option does not begin with --stat: %s", arg);
3427
end = (char *)arg;
3428
3429
switch (*arg) {