@matheusbsbs / matheus-bagliano / commits / 57165db003

index-pack: always zero-initialize object_entry list

Commit 38a4556 (index-pack: start learning to emulate "verify-pack -v", 2011-06-03) added a "delta_depth" counter to each "struct object_entry". Initially, all object entries have their depth set to 0; in resolve_delta, we then set the depth of each delta to "base + 1". Base entries never have their depth touched, and remain at 0. To ensure that all depths start at 0, that commit changed calls to xmalloc the object_entry list into calls to xcalloc. However, it forgot that we grow the list with xrealloc later. These extra entries are used when we add an object from elsewhere to complete a thin pack. If we add a non-delta object, its depth value will just be uninitialized heap data. This patch fixes it by zero-initializing entries we add to the objects list via the xrealloc. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Mar 19, 2013 at 12:17 UTC 57165db00309e756d6d22b097a2fd6cc14055d14

1 file changed +2

builtin/index-pack.c

@@ -1106,6 +1106,8 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha

1106 objects = xrealloc(objects,

1107 (nr_objects + nr_unresolved + 1)

1108 * sizeof(*objects));

1109 + memset(objects + nr_objects + 1, 0,

1110 + nr_unresolved * sizeof(*objects));

1111 f = sha1fd(output_fd, curr_pack);

1112 fix_unresolved_deltas(f, nr_unresolved);

1113 sprintf(msg, "completed with %d local objects",