object-file: fix memory leak when reading corrupted headers

When reading corrupt object headers in `read_loose_object()`, we bail
out immediately. This causes a memory leak though because we would have
already initialized the zstream in `unpack_loose_header()`, and it is
the callers responsibility to finish the zstream even on error. While
this feels weird, other callsites do it correctly already.

Fix this leak by ending the zstream even on errors. We may want to
revisit this interface in the future such that the callee handles this
for us already when there was an error.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object-file.c b/object-file.c
index 065103be3ea923e3fcc87bf5e8e366d202544b14..7c65c435cdaae4e1b037415816e1f4fca065a33f 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -2954,6 +2954,7 @@ int read_loose_object(const char *path,
        if (unpack_loose_header(&stream, map, mapsize, hdr, sizeof(hdr),
                                NULL) != ULHR_OK) {
                error(_("unable to unpack header of %s"), path);
+               git_inflate_end(&stream);
                goto out;
        }
 

diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 8a456b1142d1cc463f97c5e8809bcfc83ffa1e96..280cbf3e031e1ab67ed28aa2af4c3b105b7d254e 100755 (executable)
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -6,6 +6,7 @@ test_description='git fsck random collection of tests
 * (main) A
 '
 
+TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '