submodule-config: avoid memory leak
In 961b130d20c9 (branch: add --recurse-submodules option for branch creation, 2022-01-28), a funny pattern was introduced where first some struct is `xmalloc()`ed, then we resize an array whose element type is the same struct, and then the first struct's contents are copied into the last element of that array. Crucially, the `xmalloc()`ed memory never gets released. Let's avoid that memory leak and that memory allocation dance altogether by first reallocating the array, then using a pointer to the last array element to go forward. Reported by Coverity. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jun 15, 2022 at 23:35 UTC
f53559227ccb600f4fdd1bfe08e1164a5aed60b5
1 file changed
+4
-4
submodule-config.c
+4
-4
@@ -756,7 +756,10 @@ static void traverse_tree_submodules(struct repository *r,
756
757
if (S_ISGITLINK(name_entry->mode) &&
758
is_tree_submodule_active(r, root_tree, tree_path)) {
759
- st_entry = xmalloc(sizeof(*st_entry));
759
+ ALLOC_GROW(out->entries, out->entry_nr + 1,
760
+ out->entry_alloc);
761
+ st_entry = &out->entries[out->entry_nr++];
762
+
763
st_entry->name_entry = xmalloc(sizeof(*st_entry->name_entry));
764
*st_entry->name_entry = *name_entry;
765
st_entry->submodule =
@@ -766,9 +769,6 @@ static void traverse_tree_submodules(struct repository *r,
769
root_tree))
770
FREE_AND_NULL(st_entry->repo);
771
769
- ALLOC_GROW(out->entries, out->entry_nr + 1,
770
- out->entry_alloc);
771
- out->entries[out->entry_nr++] = *st_entry;
772
} else if (S_ISDIR(name_entry->mode))
773
traverse_tree_submodules(r, root_tree, tree_path,
774
&name_entry->oid, out);