diff options
| author |  Jeff King <peff@peff.net> | 2021-05-01 10:04:34 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-05-03 14:30:46 +0900 |
| commit | 6d52b6a5dfe0bee20dbfb2a3a7291bcf9a152672 (patch) | |
| tree | a336a83b0d4ac3374ca662e1d3efbb000ddf5b37 /builtin/pack-objects.c | |
| parent | t5316: check behavior of pack-objects --depth=0 (diff) | |
| download | tgif-6d52b6a5dfe0bee20dbfb2a3a7291bcf9a152672.tar.xz | |
pack-objects: clamp negative depth to 0
A negative delta depth makes no sense, and the code is not prepared to
handle it. If passed "--depth=-1" on the command line, then this line
from break_delta_chains():
cur->depth = (total_depth--) % (depth + 1);
triggers a divide-by-zero. This is undefined behavior according to the C
standard, but on POSIX systems results in SIGFPE killing the process.
This is certainly one way to inform the use that the command was
invalid, but it's a bit friendlier to just treat it as "don't allow any
deltas", which we already do for --depth=0.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index ea7a5b3ba5..da5e0700f9 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3861,6 +3861,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) if (pack_to_stdout != !base_name || argc) usage_with_options(pack_usage, pack_objects_options); + if (depth < 0) + depth = 0; if (depth >= (1 << OE_DEPTH_BITS)) { warning(_("delta chain depth %d is too deep, forcing %d"), depth, (1 << OE_DEPTH_BITS) - 1); |