Merge branch 'nd/sha1-file-delta-stack-leakage-fix'

Fix a small leak in the delta stack used when resolving a long
delta chain at runtime.

* nd/sha1-file-delta-stack-leakage-fix:
sha1_file: fix delta_stack memory leak in unpack_entry

diff --git a/sha1_file.c b/sha1_file.c
index b37c6f67e4d97b95b4fb070aa03992eb92506421..18b2378d8a63e1dbb621854c311652fe0abef76f 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2288,6 +2288,10 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
        *final_size = size;
 
        unuse_pack(&w_curs);
+
+       if (delta_stack != small_delta_stack)
+               free(delta_stack);
+
        return data;
 }