mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'jk/fast-import-fixes'
With sufficiently long refnames, fast-import could have overflown an on-stack buffer. * jk/fast-import-fixes: fast-import: fix buffer overflow in dump_tags fast-import: clean up pack_data pointer in end_packfile
This commit is contained in:
commit
b6a1261751
|
@ -946,10 +946,12 @@ static void unkeep_all_packs(void)
|
|||
|
||||
static void end_packfile(void)
|
||||
{
|
||||
struct packed_git *old_p = pack_data, *new_p;
|
||||
if (!pack_data)
|
||||
return;
|
||||
|
||||
clear_delta_base_cache();
|
||||
if (object_count) {
|
||||
struct packed_git *new_p;
|
||||
unsigned char cur_pack_sha1[20];
|
||||
char *idx_name;
|
||||
int i;
|
||||
|
@ -991,10 +993,11 @@ static void end_packfile(void)
|
|||
pack_id++;
|
||||
}
|
||||
else {
|
||||
close(old_p->pack_fd);
|
||||
unlink_or_warn(old_p->pack_name);
|
||||
close(pack_data->pack_fd);
|
||||
unlink_or_warn(pack_data->pack_name);
|
||||
}
|
||||
free(old_p);
|
||||
free(pack_data);
|
||||
pack_data = NULL;
|
||||
|
||||
/* We can't carry a delta across packfiles. */
|
||||
strbuf_release(&last_blob.data);
|
||||
|
|
Loading…
Reference in a new issue