Skip to content

Commit d2451fe

Browse files
authored
Merge pull request libgit2#3984 from pks-t/pks/pack-find-offset-race
pack: fix race in pack_entry_find_offset
2 parents 19001ca + 0cf15e3 commit d2451fe

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/pack.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1268,8 +1268,8 @@ static int pack_entry_find_offset(
12681268
const git_oid *short_oid,
12691269
size_t len)
12701270
{
1271-
const uint32_t *level1_ofs = p->index_map.data;
1272-
const unsigned char *index = p->index_map.data;
1271+
const uint32_t *level1_ofs;
1272+
const unsigned char *index;
12731273
unsigned hi, lo, stride;
12741274
int pos, found = 0;
12751275
git_off_t offset;
@@ -1283,11 +1283,11 @@ static int pack_entry_find_offset(
12831283
if ((error = pack_index_open(p)) < 0)
12841284
return error;
12851285
assert(p->index_map.data);
1286-
1287-
index = p->index_map.data;
1288-
level1_ofs = p->index_map.data;
12891286
}
12901287

1288+
index = p->index_map.data;
1289+
level1_ofs = p->index_map.data;
1290+
12911291
if (p->index_version > 1) {
12921292
level1_ofs += 2;
12931293
index += 8;

0 commit comments

Comments
 (0)