summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2009-03-24 19:56:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-24 21:37:30 (GMT)
commit720fe22d50a58e3308124ec7f5b0fa6c17be3d22 (patch)
treef1e83f692180fb95cd136b7383aa9f8d742c1ddf /builtin-pack-objects.c
parent3e5970a41ec0809efb792357af546ffa96568f66 (diff)
downloadgit-720fe22d50a58e3308124ec7f5b0fa6c17be3d22.zip
git-720fe22d50a58e3308124ec7f5b0fa6c17be3d22.tar.gz
git-720fe22d50a58e3308124ec7f5b0fa6c17be3d22.tar.bz2
avoid possible overflow in delta size filtering computation
On a 32-bit system, the maximum possible size for an object is less than 4GB, while 64-bit systems may cope with larger objects. Due to this limitation, variables holding object sizes are using an unsigned long type (32 bits on 32-bit systems, or 64 bits on 64-bit systems). When large objects are encountered, and/or people play with large delta depth values, it is possible for the maximum allowed delta size computation to overflow, especially on a 32-bit system. When this occurs, surviving result bits may represent a value much smaller than what it is supposed to be, or even zero. This prevents some objects from being deltified although they do get deltified when a smaller depth limit is used. Fix this by always performing a 64-bit multiplication. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index fb5e14d..84a13c7 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -1265,7 +1265,7 @@ static int try_delta(struct unpacked *trg, struct unpacked *src,
max_size = trg_entry->delta_size;
ref_depth = trg->depth;
}
- max_size = max_size * (max_depth - src->depth) /
+ max_size = (uint64_t)max_size * (max_depth - src->depth) /
(max_depth - ref_depth + 1);
if (max_size == 0)
return 0;