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 /convert-objects.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 'convert-objects.c')
| -rw-r--r-- | convert-objects.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/convert-objects.c b/convert-objects.c index 4809f9199..cf03bcfe5 100644 --- a/convert-objects.c +++ b/convert-objects.c @@ -88,7 +88,7 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base unsigned int mode; char *slash, *origpath; - if (!path || sscanf(buffer, "%o", &mode) != 1) + if (!path || strtoul_ui(buffer, 8, &mode) != 1) die("bad tree conversion"); mode = convert_mode(mode); path++; |