mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pack-objects: fix use of use_pack().

Browse Source 
The code calls use_pack() to make that the variably encoded
offset fits in the mmap'ed window, but it forgot that the
operation gives the pointer to the beginning of the asked
region.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2006-12-28 22:29:06 -08:00
parent f5b1b5a07e
commit 9c18df1907
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin-pack-objects.c
View File

@ -1003,6 +1003,7 @@ static void check_object(struct object_entry *entry)
if (!no_reuse_delta) { if (!no_reuse_delta) {
unsigned char c, *base_name; unsigned char c, *base_name;
unsigned long ofs; unsigned long ofs;
unsigned long used_0;
/* there is at least 20 bytes left in the pack */ /* there is at least 20 bytes left in the pack */
switch (entry->in_pack_type) { switch (entry->in_pack_type) {
case OBJ_REF_DELTA: case OBJ_REF_DELTA:
@ -1013,14 +1014,15 @@ static void check_object(struct object_entry *entry)
case OBJ_OFS_DELTA: case OBJ_OFS_DELTA:
buf = use_pack(p, &w_curs, buf = use_pack(p, &w_curs,
entry->in_pack_offset + used, NULL); entry->in_pack_offset + used, NULL);
c = buf[used++]; used_0 = 0;
c = buf[used_0++];
ofs = c & 127; ofs = c & 127;
while (c & 128) { while (c & 128) {
ofs += 1; ofs += 1;
if (!ofs || ofs & ~(~0UL >> 7)) if (!ofs || ofs & ~(~0UL >> 7))
die("delta base offset overflow in pack for %s", die("delta base offset overflow in pack for %s",
sha1_to_hex(entry->sha1)); sha1_to_hex(entry->sha1));
c = buf[used++]; c = buf[used_0++];
ofs = (ofs << 7) + (c & 127); ofs = (ofs << 7) + (c & 127);
} }
if (ofs >= entry->in_pack_offset) if (ofs >= entry->in_pack_offset)
@ -1028,6 +1030,7 @@ static void check_object(struct object_entry *entry)
sha1_to_hex(entry->sha1)); sha1_to_hex(entry->sha1));
ofs = entry->in_pack_offset - ofs; ofs = entry->in_pack_offset - ofs;
base_name = find_packed_object_name(p, ofs); base_name = find_packed_object_name(p, ofs);
used += used_0;
break; break;
default: default:
base_name = NULL; base_name = NULL;