summaryrefslogtreecommitdiff
path: root/builtin/prune-packed.c
diff options
context:
space:
mode:
authorRené Scharfe <l.s.r@web.de>2017-06-24 16:09:39 +0200
committerJunio C Hamano <gitster@pobox.com>2017-06-24 11:09:52 -0700
commit70c49050d4a16a7e2990e4d3c91d9d12f62e631e (patch)
tree0de8a7ca24f711dfe2f982eb94a5dbe346b2bbe2 /builtin/prune-packed.c
parent0375f472d484041f9b1e5550b57d69286b3322e7 (diff)
downloadgit-70c49050d4a16a7e2990e4d3c91d9d12f62e631e.tar.gz
sha1_file: guard against invalid loose subdirectory numbersrs/sha1-name-readdir-optim
Loose object subdirectories have hexadecimal names based on the first byte of the hash of contained objects, thus their numerical representation can range from 0 (0x00) to 255 (0xff). Change the type of the corresponding variable in for_each_file_in_obj_subdir() and associated callback functions to unsigned int and add a range check. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/prune-packed.c')
-rw-r--r--builtin/prune-packed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index c026299e78..ac978ad401 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -10,7 +10,7 @@ static const char * const prune_packed_usage[] = {
static struct progress *progress;
-static int prune_subdir(int nr, const char *path, void *data)
+static int prune_subdir(unsigned int nr, const char *path, void *data)
{
int *opts = data;
display_progress(progress, nr + 1);