Commit cecc778e888f28115f89b151312d6201a5f530fd
2018-01-23T11:27:29
compute off_delta offset correctly
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/lib/pack.c b/lib/pack.c
index 4e2e9d2..dc45c88 100644
--- a/lib/pack.c
+++ b/lib/pack.c
@@ -408,15 +408,9 @@ decode_negative_offset(int64_t *offset, size_t *len, FILE *packfile)
if (i == 0)
o = (offN & GOT_PACK_OBJ_DELTA_OFF_VAL_MASK);
else {
- int j;
- int64_t v = 128;
+ o++;
o <<= 7;
- o |= (offN & GOT_PACK_OBJ_DELTA_OFF_VAL_MASK);
- o += v;
- for (j = 0; j < i; j++) {
- v <<= 7;
- o += v;
- }
+ o += (offN & GOT_PACK_OBJ_DELTA_OFF_VAL_MASK);
}
i++;
} while (offN & GOT_PACK_OBJ_DELTA_OFF_MORE);
@@ -429,7 +423,7 @@ decode_negative_offset(int64_t *offset, size_t *len, FILE *packfile)
static const struct got_error *
open_offset_delta_object(struct got_object **obj, struct got_repository *repo,
const char *path_packfile, FILE *packfile, struct got_object_id *id,
- off_t offset, size_t size)
+ off_t offset, size_t tslen, size_t size)
{
const struct got_error *err = NULL;
int64_t negoffset;
@@ -489,7 +483,7 @@ open_offset_delta_object(struct got_object **obj, struct got_repository *repo,
(*obj)->hdrlen = 0;
(*obj)->size = size;
memcpy(&(*obj)->id, id, sizeof((*obj)->id));
- (*obj)->pack_offset = offset;
+ (*obj)->pack_offset = offset + tslen;
(*obj)->base_type = base_type;
(*obj)->base_size = base_size;
(*obj)->base_obj_offset = base_obj_offset;
@@ -559,7 +553,7 @@ open_packed_object(struct got_object **obj, struct got_repository *repo,
case GOT_OBJ_TYPE_OFFSET_DELTA:
err = open_offset_delta_object(obj, repo, path_packfile,
- packfile, id, offset + tslen, size);
+ packfile, id, offset, tslen, size);
break;
case GOT_OBJ_TYPE_REF_DELTA: