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=--cc

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()
---

1e7d8f54b186c5ce666c939dfe2cb3bf8538ec40
diff --cc sha1_file.c
index 607b34ea53,ba282c06bd..81d03ce859
--- a/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)