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

Merge branch 'maint'

Browse Source 
* maint:
  sha1_file: Fix infinite loop when pack is corrupted
This commit is contained in:
Junio C Hamano
2009-10-14 16:10:37 -07:00
parent 18a536476e b3118bdc91
commit 695f9523dd
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sha1_file.c
View File

@ -1357,6 +1357,8 @@ unsigned long get_size_from_delta(struct packed_git *p,
in = use_pack(p, w_curs, curpos, &stream.avail_in); in = use_pack(p, w_curs, curpos, &stream.avail_in);
stream.next_in = in; stream.next_in = in;
st = git_inflate(&stream, Z_FINISH); st = git_inflate(&stream, Z_FINISH);
if (st == Z_BUF_ERROR && (stream.avail_in || !stream.avail_out))
break;
curpos += stream.next_in - in; curpos += stream.next_in - in;
} while ((st == Z_OK || st == Z_BUF_ERROR) && } while ((st == Z_OK || st == Z_BUF_ERROR) &&
stream.total_out < sizeof(delta_head)); stream.total_out < sizeof(delta_head));
@ -1594,6 +1596,8 @@ static void *unpack_compressed_entry(struct packed_git *p,
in = use_pack(p, w_curs, curpos, &stream.avail_in); in = use_pack(p, w_curs, curpos, &stream.avail_in);
stream.next_in = in; stream.next_in = in;
st = git_inflate(&stream, Z_FINISH); st = git_inflate(&stream, Z_FINISH);
if (st == Z_BUF_ERROR && (stream.avail_in || !stream.avail_out))
break;
curpos += stream.next_in - in; curpos += stream.next_in - in;
} while (st == Z_OK || st == Z_BUF_ERROR); } while (st == Z_OK || st == Z_BUF_ERROR);
git_inflate_end(&stream); git_inflate_end(&stream);

9
t/t5303-pack-corruption-resilience.sh
View File

@ -275,4 +275,13 @@ test_expect_success \
git cat-file blob $blob_2 > /dev/null && git cat-file blob $blob_2 > /dev/null &&
git cat-file blob $blob_3 > /dev/null' git cat-file blob $blob_3 > /dev/null'
test_expect_success \
'corrupting header to have too small output buffer fails unpack' \
'create_new_pack &&
git prune-packed &&
printf "\262\001" | do_corrupt_object $blob_1 0 &&
test_must_fail git cat-file blob $blob_1 > /dev/null &&
test_must_fail git cat-file blob $blob_2 > /dev/null &&
test_must_fail git cat-file blob $blob_3 > /dev/null'
test_done test_done