summaryrefslogtreecommitdiff
path: root/tree-walk.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-07-31 04:38:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-08-01 20:06:40 (GMT)
commit37806080d7be1ab5b2fa918f6a528652596ea2c1 (patch)
treefb6f260202b9ef1feba1dac3a67d36aeb2ef98e9 /tree-walk.c
parent9055384710dd8963b125f4f87c24d8f67d9fa24f (diff)
downloadgit-37806080d7be1ab5b2fa918f6a528652596ea2c1.zip
git-37806080d7be1ab5b2fa918f6a528652596ea2c1.tar.gz
git-37806080d7be1ab5b2fa918f6a528652596ea2c1.tar.bz2
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.c')
-rw-r--r--tree-walk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tree-walk.c b/tree-walk.c
index 4610f77..70f9eb5 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -168,7 +168,7 @@ int tree_entry_gently(struct tree_desc *desc, struct name_entry *entry)
void setup_traverse_info(struct traverse_info *info, const char *base)
{
- int pathlen = strlen(base);
+ size_t pathlen = strlen(base);
static struct traverse_info dummy;
memset(info, 0, sizeof(*info));
@@ -184,7 +184,7 @@ void setup_traverse_info(struct traverse_info *info, const char *base)
char *make_traverse_path(char *path, const struct traverse_info *info,
const char *name, size_t namelen)
{
- int pathlen = info->pathlen;
+ size_t pathlen = info->pathlen;
path[pathlen + namelen] = 0;
for (;;) {