Merge branch 'rs/unpack-entry-leakfix' into maint

Memory leak in an error codepath has been plugged.

* rs/unpack-entry-leakfix:
  sha1_file: release delta_stack on error in unpack_entry()

diff --cc sha1_file.c
index b60ae15,ba282c0..b7bb38b
--- 1/sha1_file.c
--- 2/sha1_file.c
+++ b/sha1_file.c
@@@ -2676,11 -2596,10 +2676,12 @@@ void *unpack_entry(struct packed_git *p
                free(external_base);
        }
  
 -      *final_type = type;
 -      *final_size = size;
 +      if (final_type)
 +              *final_type = type;
 +      if (final_size)
 +              *final_size = size;
  
+ out:
        unuse_pack(&w_curs);
  
        if (delta_stack != small_delta_stack)