From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Mar 2014 20:49:22 +0000 (-0700)
Subject: Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
X-Git-Tag: v2.0.0-rc0~100
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/decba94d2c664229d16ee7c3cc442c0ada6090b9?hp=9b347673a1efbef525ff8b39f33f0b59e829be3c

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 b37c6f67e4..18b2378d8a 100644
--- 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;
 }