diff options
| author | Jeff King <peff@peff.net> | 2019-07-31 07:38:18 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-01 23:06:40 +0300 |
| commit | 37806080d7be1ab5b2fa918f6a528652596ea2c1 (patch) | |
| tree | fb6f260202b9ef1feba1dac3a67d36aeb2ef98e9 /tree-walk.h | |
| parent | 9055384710dd8963b125f4f87c24d8f67d9fa24f (diff) | |
tree-walk: use size_t consistently
We store and manipulate the cumulative traverse_info.pathlen as an
"int", which can overflow when we are fed ridiculously long pathnames
(e.g., ones at the edge of 2GB or 4GB, even if the individual tree entry
names are smaller than that). The results can be confusing, though
after some prodding I was not able to use this integer overflow to cause
an under-allocated buffer.
Let's consistently use size_t to generate and store these, and make
sure our addition doesn't overflow.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tree-walk.h')
| -rw-r--r-- | tree-walk.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tree-walk.h b/tree-walk.h index baa2aa62c7..47bf85d282 100644 --- a/tree-walk.h +++ b/tree-walk.h @@ -60,7 +60,7 @@ struct traverse_info { size_t namelen; unsigned mode; - int pathlen; + size_t pathlen; struct pathspec *pathspec; unsigned long df_conflicts; @@ -74,9 +74,9 @@ char *make_traverse_path(char *path, const struct traverse_info *info, const char *name, size_t namelen); void setup_traverse_info(struct traverse_info *info, const char *base); -static inline int traverse_path_len(const struct traverse_info *info, const struct name_entry *n) +static inline size_t traverse_path_len(const struct traverse_info *info, const struct name_entry *n) { - return info->pathlen + tree_entry_len(n); + return st_add(info->pathlen, tree_entry_len(n)); } /* in general, positive means "kind of interesting" */ |