Skip to content
  • Jeff King's avatar
    fast-import: clean up pack_data pointer in end_packfile · 3c078b9c
    Jeff King authored and Junio C Hamano's avatar Junio C Hamano committed
    
    
    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: default avatarJeff King <peff@peff.net>
    Reviewed-by: default avatarRonnie Sahlberg <sahlberg@google.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    3c078b9c