Skip to content

Commit 6d52b6a

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 49ac1d3 commit 6d52b6a

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

builtin/pack-objects.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3861,6 +3861,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
38613861
if (pack_to_stdout != !base_name || argc)
38623862
usage_with_options(pack_usage, pack_objects_options);
38633863

3864+
if (depth < 0)
3865+
depth = 0;
38643866
if (depth >= (1 << OE_DEPTH_BITS)) {
38653867
warning(_("delta chain depth %d is too deep, forcing %d"),
38663868
depth, (1 << OE_DEPTH_BITS) - 1);

t/t5316-pack-delta-depth.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,11 @@ test_expect_success '--depth=0 disables deltas' '
102102
test_cmp expect actual
103103
'
104104

105+
test_expect_success 'negative depth disables deltas' '
106+
pack=$(git pack-objects --all --depth=-1 </dev/null pack) &&
107+
echo 0 >expect &&
108+
max_chain pack-$pack.pack >actual &&
109+
test_cmp expect actual
110+
'
111+
105112
test_done

0 commit comments

Comments
 (0)