sha1_file: release fallback base's memory in unpack_entry()

If a pack entry that's used as a delta base is corrupt, unpack_entry()
marks it as unusable and then searches the object again in the hope that
it can be found in another pack or in a loose file.  The memory for this
external base object is never released.  Free it after use.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1_file.c b/sha1_file.c
index 727a9769fb7549e365e66f4ecb65f8e665898a96..9a16e3841c5b2f0d2c8982880ebc8a8f5a3afc07 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2351,6 +2351,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
        while (delta_stack_nr) {
                void *delta_data;
                void *base = data;
        while (delta_stack_nr) {
                void *delta_data;
                void *base = data;

+               void *external_base = NULL;

                unsigned long delta_size, base_size = size;
                int i;
 
                unsigned long delta_size, base_size = size;
                int i;
 


@@ -2377,6 +2378,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
                                      p->pack_name);
                                mark_bad_packed_object(p, base_sha1);
                                base = read_object(base_sha1, &type, &base_size);
                                      p->pack_name);
                                mark_bad_packed_object(p, base_sha1);
                                base = read_object(base_sha1, &type, &base_size);

+                               external_base = base;

                        }
                }
 
                        }
                }
 


@@ -2395,6 +2397,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
                              "at offset %"PRIuMAX" from %s",
                              (uintmax_t)curpos, p->pack_name);
                        data = NULL;
                              "at offset %"PRIuMAX" from %s",
                              (uintmax_t)curpos, p->pack_name);
                        data = NULL;

+                       free(external_base);

                        continue;
                }
 
                        continue;
                }
 


@@ -2414,6 +2417,7 @@ void *unpack_entry(struct packed_git *p, off_t obj_offset,
                        error("failed to apply delta");
 
                free(delta_data);
                        error("failed to apply delta");
 
                free(delta_data);

+               free(external_base);

        }
 
        *final_type = type;
        }
 
        *final_type = type;