@ -87,6 +87,7 @@ static struct progress *progress;
static unsigned char input_buffer[4096];
static unsigned char input_buffer[4096];
static unsigned int input_offset, input_len;
static unsigned int input_offset, input_len;
static off_t consumed_bytes;
static off_t consumed_bytes;
static off_t max_input_size;
static unsigned deepest_delta;
static unsigned deepest_delta;
static git_SHA_CTX input_ctx;
static git_SHA_CTX input_ctx;
static uint32_t input_crc32;
static uint32_t input_crc32;
@ -297,6 +298,8 @@ static void use(int bytes)
if (signed_add_overflows(consumed_bytes, bytes))
if (signed_add_overflows(consumed_bytes, bytes))
die(_("pack too large for current definition of off_t"));
die(_("pack too large for current definition of off_t"));
consumed_bytes += bytes;
consumed_bytes += bytes;
if (max_input_size && consumed_bytes > max_input_size)
die(_("pack exceeds maximum allowed size"));
}
}
static const char *open_pack_file(const char *pack_name)
static const char *open_pack_file(const char *pack_name)
@ -1714,6 +1717,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
opts.off32_limit = strtoul(c+1, &c, 0);
opts.off32_limit = strtoul(c+1, &c, 0);
if (*c || opts.off32_limit & 0x80000000)
if (*c || opts.off32_limit & 0x80000000)
die(_("bad %s"), arg);
die(_("bad %s"), arg);
} else if (skip_prefix(arg, "--max-input-size=", &arg)) {
max_input_size = strtoumax(arg, NULL, 10);
} else
} else
usage(index_pack_usage);
usage(index_pack_usage);
continue;
continue;