Merge branch 'rs/sha1-file-plug-fallback-base-leak' into maint
commite36e28e6971e9b9975d46485dfbfa5cc3fbd41ed
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:27 +0000 (21 15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Mar 2017 22:03:27 +0000 (21 15:03 -0700)
treedff2ebdf49f15b678227088b38edf89455b7c2de
parentd46d432577800b0698d18e79ede3f290f0479483
parent886ddf4777d119f0a420bdf55fba834c16c58069
Merge branch 'rs/sha1-file-plug-fallback-base-leak' into maint

A leak in a codepath to read from a packed object in (rare) cases
has been plugged.

* rs/sha1-file-plug-fallback-base-leak:
  sha1_file: release fallback base's memory in unpack_entry()
sha1_file.c