undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/fast-import-fixes'

Browse Source 
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:
Junio C Hamano 2014-09-11 10:33:34 -07:00
commit b6a1261751
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fast-import.c
View File

@ -946,10 +946,12 @@ static void unkeep_all_packs(void)
static void end_packfile(void) static void end_packfile(void)
{ {
struct packed_git *old_p = pack_data, *new_p; if (!pack_data)
return;
clear_delta_base_cache(); clear_delta_base_cache();
if (object_count) { if (object_count) {
struct packed_git *new_p;
unsigned char cur_pack_sha1[20]; unsigned char cur_pack_sha1[20];
char *idx_name; char *idx_name;
int i; int i;
@ -991,10 +993,11 @@ static void end_packfile(void)
pack_id++; pack_id++;
} }
else { else {
close(old_p->pack_fd); close(pack_data->pack_fd);
unlink_or_warn(old_p->pack_name); unlink_or_warn(pack_data->pack_name);
} }
free(old_p); free(pack_data);
pack_data = NULL;
/* We can't carry a delta across packfiles. */ /* We can't carry a delta across packfiles. */
strbuf_release(&last_blob.data); strbuf_release(&last_blob.data);