Merge branch 'ab/plug-random-leaks'

[thirdparty/git.git] / builtin / index-pack.c

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index c45273de3b124942553647ae0f216b4e6a3bb3d1..38fb4f4e55ceac0acf3f9c15733623a0cd114d44 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -1113,6 +1113,7 @@ static void *threaded_second_pass(void *data)
                        list_add(&child->list, &work_head);
                        base_cache_used += child->size;
                        prune_base_data(NULL);
+                       free_base_data(child);
                } else {
                        /*
                         * This child does not have its own children. It may be
@@ -1135,6 +1136,7 @@ static void *threaded_second_pass(void *data)
 
                                p = next_p;
                        }
+                       FREE_AND_NULL(child);
                }
                work_unlock();
        }
@@ -1428,6 +1430,7 @@ static void fix_unresolved_deltas(struct hashfile *f)
                 * object).
                 */
                append_obj_to_pack(f, d->oid.hash, data, size, type);
+               free(data);
                threaded_second_pass(NULL);
 
                display_progress(progress, nr_resolved_deltas);
@@ -1707,6 +1710,7 @@ static void show_pack_info(int stat_only)
                          i + 1,
                          chain_histogram[i]);
        }
+       free(chain_histogram);
 }
 
 int cmd_index_pack(int argc, const char **argv, const char *prefix)
@@ -1936,6 +1940,7 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
        if (do_fsck_object && fsck_finish(&fsck_options))
                die(_("fsck error in pack objects"));
 
+       free(opts.anomaly);
        free(objects);
        strbuf_release(&index_name_buf);
        strbuf_release(&rev_index_name_buf);