summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-03-09 16:01:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-03-09 18:25:27 (GMT)
commit4f33a6345f2bd6e47253d1dbefd01874d895ab2e (patch)
tree4d0d23fbf380aabd8f2af4e835ba174f41b3b6fb /bundle.c
parentf0d2f84919885d4dfb940e79a8e340bd2ad1887d (diff)
downloadgit-4f33a6345f2bd6e47253d1dbefd01874d895ab2e.zip
git-4f33a6345f2bd6e47253d1dbefd01874d895ab2e.tar.gz
git-4f33a6345f2bd6e47253d1dbefd01874d895ab2e.tar.bz2
list-objects: handle NULL function pointers
If a caller to traverse_commit_list() specifies the options for the --objects flag but does not specify a show_object function pointer, the result is a segfault. This is currently visible by running 'git bundle create --objects HEAD'. We could fix this problem by supplying a no-op callback in builtin/bundle.c, but that only solves the problem for one builtin, leaving this segfault open for other callers. Replace all callers of the show_commit and show_object function pointers in list-objects.c to call helper functions show_commit() and show_object() which check that the given context has non-NULL functions before passing the necessary data. One extra benefit is that it reduces duplication due to passing ctx->show_data to every caller. Test that this segfault no longer occurs for 'git bundle'. Co-authored-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bundle.c b/bundle.c
index a0bb687..7ba60a5 100644
--- a/bundle.c
+++ b/bundle.c
@@ -544,6 +544,8 @@ int create_bundle(struct repository *r, const char *path,
die("revision walk setup failed");
bpi.fd = bundle_fd;
bpi.pending = &revs_copy.pending;
+
+ revs.blob_objects = revs.tree_objects = 0;
traverse_commit_list(&revs, write_bundle_prerequisites, NULL, &bpi);
object_array_remove_duplicates(&revs_copy.pending);