summaryrefslogtreecommitdiff
path: root/diff-delta.c
diff options
context:
space:
mode:
authorMartin Koegler <martin.koegler@chello.at>2017-08-10 07:01:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-10 20:55:22 (GMT)
commit3f0a67a1f68d79f102ac11a8b6e7a72dc86be613 (patch)
tree2ee68e38eb7c55ba837e05750c4ee2b5a42a7696 /diff-delta.c
parent4274c698f46a9bc45834c4904e7e113450c042fb (diff)
downloadgit-3f0a67a1f68d79f102ac11a8b6e7a72dc86be613.zip
git-3f0a67a1f68d79f102ac11a8b6e7a72dc86be613.tar.gz
git-3f0a67a1f68d79f102ac11a8b6e7a72dc86be613.tar.bz2
diff-delta: fix encoding size that would not fit in "unsigned int"
The current delta code produces incorrect pack objects for files > 4GB, because the size is copied from size_t field to "unsigned int" variables during the encoding process. Signed-off-by: Martin Koegler <martin.koegler@chello.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff-delta.c')
-rw-r--r--diff-delta.c24
1 files changed, 13 insertions, 11 deletions
diff --git a/diff-delta.c b/diff-delta.c
index 3797ce6..cd238c8 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -319,7 +319,9 @@ create_delta(const struct delta_index *index,
const void *trg_buf, unsigned long trg_size,
unsigned long *delta_size, unsigned long max_size)
{
- unsigned int i, outpos, outsize, moff, msize, val;
+ unsigned int i, val;
+ off_t outpos, moff;
+ size_t l, outsize, msize;
int inscnt;
const unsigned char *ref_data, *ref_top, *data, *top;
unsigned char *out;
@@ -336,20 +338,20 @@ create_delta(const struct delta_index *index,
return NULL;
/* store reference buffer size */
- i = index->src_size;
- while (i >= 0x80) {
- out[outpos++] = i | 0x80;
- i >>= 7;
+ l = index->src_size;
+ while (l >= 0x80) {
+ out[outpos++] = l | 0x80;
+ l >>= 7;
}
- out[outpos++] = i;
+ out[outpos++] = l;
/* store target buffer size */
- i = trg_size;
- while (i >= 0x80) {
- out[outpos++] = i | 0x80;
- i >>= 7;
+ l = trg_size;
+ while (l >= 0x80) {
+ out[outpos++] = l | 0x80;
+ l >>= 7;
}
- out[outpos++] = i;
+ out[outpos++] = l;
ref_data = index->src_buf;
ref_top = ref_data + index->src_size;