path: root/shallow.c
diff options
authorJunio C Hamano <>2017-05-29 03:34:44 (GMT)
committerJunio C Hamano <>2017-05-29 03:34:44 (GMT)
commit849e671b52e11d4a2f70d577dd2c806f3ca756fe (patch)
treef564d4d2782856efcdcff278b385a989c031a6c1 /shallow.c
parent137a2613a07e556fd77fe374c6f4edd2d5e1b1fc (diff)
parent443a12f37be1c5967785b83bf04935fe357afb9b (diff)
Merge branch 'js/plug-leaks'
Fix memory leaks pointed out by Coverity (and people). * js/plug-leaks: (26 commits) checkout: fix memory leak submodule_uses_worktrees(): plug memory leak show_worktree(): plug memory leak name-rev: avoid leaking memory in the `deref` case remote: plug memory leak in match_explicit() add_reflog_for_walk: avoid memory leak shallow: avoid memory leak line-log: avoid memory leak receive-pack: plug memory leak in update() fast-export: avoid leaking memory in handle_tag() mktree: plug memory leaks reported by Coverity pack-redundant: plug memory leak setup_discovered_git_dir(): plug memory leak setup_bare_git_dir(): help static analysis split_commit_in_progress(): simplify & fix memory leak checkout: fix memory leak cat-file: fix memory leak mailinfo & mailsplit: check for EOF while parsing status: close file descriptor after reading git-rebase-todo difftool: address a couple of resource/memory leaks ...
Diffstat (limited to 'shallow.c')
1 files changed, 6 insertions, 2 deletions
diff --git a/shallow.c b/shallow.c
index 6950cc2..ef7ca78 100644
--- a/shallow.c
+++ b/shallow.c
@@ -473,11 +473,15 @@ static void paint_down(struct paint_info *info, const struct object_id *oid,
struct commit_list *head = NULL;
int bitmap_nr = (info->nr_bits + 31) / 32;
size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr);
- uint32_t *tmp = xmalloc(bitmap_size); /* to be freed before return */
- uint32_t *bitmap = paint_alloc(info);
struct commit *c = lookup_commit_reference_gently(oid, 1);
+ uint32_t *tmp; /* to be freed before return */
+ uint32_t *bitmap;
if (!c)
+ tmp = xmalloc(bitmap_size);
+ bitmap = paint_alloc(info);
memset(bitmap, 0, bitmap_size);
bitmap[id / 32] |= (1U << (id % 32));
commit_list_insert(c, &head);