Merge branch 'maint'

diff --git a/sha1_file.c b/sha1_file.c
index b219d4d5f246eef13c3fe22cd39497b621d7cc4b..9978a58da68bbf6f3482545d9f290fbfa3f3fe34 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -1570,6 +1570,10 @@ static void *unpack_delta_entry(struct packed_git *p,
                    (uintmax_t)base_offset, p->pack_name);
 
        delta_data = unpack_compressed_entry(p, w_curs, curpos, delta_size);
+       if (!delta_data)
+               die("failed to unpack compressed delta"
+                   " at %"PRIuMAX" from %s",
+                   (uintmax_t)curpos, p->pack_name);
        result = patch_delta(base, base_size,
                             delta_data, delta_size,
                             sizep);