From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jun 2014 22:33:25 +0000 (-0700)
Subject: revision: parse "git log -<count>" more carefully
X-Git-Tag: v2.0.1~25^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e3fa568cb397a78a56716137c826f21f5e0b0a77?ds=inline;hp=--cc

revision: parse "git log -<count>" more carefully

This mistyped command line simply ignores "master" and ends up
showing two commits from the current HEAD:

$ git log -2master

because we feed "2master" to atoi() without making sure that the
whole string is parsed as an integer.

Use the strtol_i() helper function instead.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

e3fa568cb397a78a56716137c826f21f5e0b0a77
diff --git a/revision.c b/revision.c
index 7afedc50fc..d5e2f1a257 100644
--- a/revision.c
+++ b/revision.c
@@ -1612,8 +1612,10 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->skip_count = atoi(optarg);
 		return argcount;
 	} else if ((*arg == '-') && isdigit(arg[1])) {
-	/* accept -<digit>, like traditional "head" */
-		revs->max_count = atoi(arg + 1);
+		/* accept -<digit>, like traditional "head" */
+		if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
+		    revs->max_count < 0)
+			die("'%s': not a non-negative integer", arg + 1);
 		revs->no_walk = 0;
 	} else if (!strcmp(arg, "-n")) {
 		if (argc <= 1)