From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Aug 2017 20:53:02 +0000 (-0700)
Subject: Merge branch 'rs/unpack-entry-leakfix' into next
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e7d8f54b186c5ce666c939dfe2cb3bf8538ec40?hp=5f879d8261e27107adda0120411e1dde0b13343b

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

Memory leak in an error codepath has been plugged.

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

diff --git a/sha1_file.c b/sha1_file.c
index 607b34ea53..81d03ce859 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2542,8 +2542,8 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
 				error("bad packed object CRC for %s",
 				      sha1_to_hex(sha1));
 				mark_bad_packed_object(p, sha1);
-				unuse_pack(&w_curs);
-				return NULL;
+				data = NULL;
+				goto out;
 			}
 		}
 
@@ -2681,6 +2681,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
 	if (final_size)
 		*final_size = size;
 
+out:
 	unuse_pack(&w_curs);
 
 	if (delta_stack != small_delta_stack)