development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fast-import: clean up pack_data pointer in end_packfile

Browse source 
We have a global pointer pack_data pointing to the current
pack we have open. Inside end_packfile we have two new
pointers, old_p and new_p. The latter points to pack_data,
and the former points to the new "installed" version of the
packfile we get when we hand the file off to the regular
sha1_file machinery. When then free old_p.

Presumably the extra old_p pointer was there so that we
could overwrite pack_data with new_p and still free old_p,
but we don't do that. We just leave pack_data pointing to
bogus memory, and don't overwrite it until we call
start_packfile again (if ever).

This can cause problems for our die routine, which calls
end_packfile to clean things up. If we die at the wrong
moment, we can end up looking at invalid memory in
pack_data left after the last end_packfile().

Instead, let's make sure we set pack_data to NULL after we
free it, and make calling endfile() again with a NULL
pack_data a noop (there is nothing to end).

We can further make things less confusing by dropping old_p
entirely, and moving new_p closer to its point of use.

Signed-off-by: Jeff King <peff@peff.net>
Reviewed-by: Ronnie Sahlberg <sahlberg@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2014-08-23 01:27:41 -04:00 committed by Junio C Hamano
parent 32f56600bb
commit 3c078b9c86
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

@ -945,10 +945,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;
@ -990,10 +992,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);