diff options
| author | Jim Meyering <jim@meyering.net> | 2007-04-10 01:01:44 +0200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-04-14 19:47:20 -0700 |
| commit | 61d6ed139ff572937c8ff342cfa16e40d2f9011e (patch) | |
| tree | 29b2e07cd60e44e0ad076c7d5b9fb690f346c737 /builtin-grep.c | |
| parent | e94b4d2f2a3a9b2aaaac15c33d5d31f76531ecbf (diff) | |
| download | git-61d6ed139ff572937c8ff342cfa16e40d2f9011e.tar.gz git-61d6ed139ff572937c8ff342cfa16e40d2f9011e.tar.xz | |
sscanf/strtoul: parse integers robustly
* builtin-grep.c (strtoul_ui): Move function definition from here, to...
* git-compat-util.h (strtoul_ui): ...here, with an added "base" parameter.
* builtin-grep.c (cmd_grep): Update use of strtoul_ui to include base, "10".
* builtin-update-index.c (read_index_info): Diagnose an invalid mode integer
that is out of range or merely larger than INT_MAX.
(cmd_update_index): Use strtoul_ui, not sscanf.
* convert-objects.c (write_subdirectory): Likewise.
Signed-off-by: Jim Meyering <jim@meyering.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-grep.c')
| -rw-r--r-- | builtin-grep.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/builtin-grep.c b/builtin-grep.c index 981f3d4d8..e13cb31f2 100644 --- a/builtin-grep.c +++ b/builtin-grep.c @@ -434,19 +434,6 @@ static const char emsg_missing_context_len[] = static const char emsg_missing_argument[] = "option requires an argument -%s"; -static int strtoul_ui(char const *s, unsigned int *result) -{ - unsigned long ul; - char *p; - - errno = 0; - ul = strtoul(s, &p, 10); - if (errno || *p || p == s || (unsigned int) ul != ul) - return -1; - *result = ul; - return 0; -} - int cmd_grep(int argc, const char **argv, const char *prefix) { int hit = 0; @@ -569,7 +556,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix) scan = arg + 1; break; } - if (strtoul_ui(scan, &num)) + if (strtoul_ui(scan, 10, &num)) die(emsg_invalid_context_len, scan); switch (arg[1]) { case 'A': |