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 /git-compat-util.h | |
| 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 'git-compat-util.h')
| -rw-r--r-- | git-compat-util.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h index 139fc1910..5f6a281b7 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -301,4 +301,17 @@ static inline int prefixcmp(const char *str, const char *prefix) return strncmp(str, prefix, strlen(prefix)); } +static inline int strtoul_ui(char const *s, int base, unsigned int *result) +{ + unsigned long ul; + char *p; + + errno = 0; + ul = strtoul(s, &p, base); + if (errno || *p || p == s || (unsigned int) ul != ul) + return -1; + *result = ul; + return 0; +} + #endif |