Merge branch 'jc/t1512-fix' into maint

diff --git a/sha1_file.c b/sha1_file.c
index 64228a26d0be873040ebde37e95e62d20f5ba957..b114cc922d4abce741b56e9da11fbef1382b4008 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2128,7 +2128,6 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
                        error("failed to unpack compressed delta "
                              "at offset %"PRIuMAX" from %s",
                              (uintmax_t)curpos, p->pack_name);
-                       free(base);
                        data = NULL;
                        continue;
                }
@@ -2139,7 +2138,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
                if (!data)
                        die("failed to apply delta");
 
-               free (delta_data);
+               free(delta_data);
        }
 
        *final_type = type;