Merge branch 'jk/index-pack-correct-depth-fix' into maint

* jk/index-pack-correct-depth-fix: index-pack: always zero-initialize object_entry list
git-mirror · Apr 4, 2013 · 68447f0 · 68447f0
2 parents 8ce0ab4 + 57165db
commit 68447f0
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
@@ -1107,6 +1107,8 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha
 		objects = xrealloc(objects,
 				   (nr_objects + nr_unresolved + 1)
 				   * sizeof(*objects));
+		memset(objects + nr_objects + 1, 0,
+		       nr_unresolved * sizeof(*objects));
 		f = sha1fd(output_fd, curr_pack);
 		fix_unresolved_deltas(f, nr_unresolved);
 		strbuf_addf(&msg, _("completed with %d local objects"),