mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 22:06:15 +02:00
Code

Merge branch 'mk/diff-delta-uint-may-be-shorter-than-ulong' 

The machinery to create xdelta used in pack files received the
sizes of the data in size_t, but lost the higher bits of them by
storing them in "unsigned int" during the computation, which is
fixed.

* mk/diff-delta-uint-may-be-shorter-than-ulong:
  diff-delta: fix encoding size that would not fit in "unsigned int"
This commit is contained in:
Junio C Hamano 2017-09-28 14:47:56 +09:00
parent 73ecdc606e 3f0a67a1f6
commit 3d09e79b27
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
diff-delta.c
View File

@ -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;