about summary refs log tree commit diff stats
path: root/ui-tree.c
diff options
context:
space:
mode:
authorJason A. Donenfeld2020-03-12 20:52:35 -0600
committerJason A. Donenfeld2020-03-13 17:48:34 -0600
commit6a8d6d4b5021af6c90ca0da806691987df449469 (patch)
treedb4984608a96ce279e25c580895d4084d2b1e24f /ui-tree.c
parentui-snapshot: add support for zstd compression (diff)
downloadcgit-6a8d6d4b5021af6c90ca0da806691987df449469.tar.gz
cgit-6a8d6d4b5021af6c90ca0da806691987df449469.zip
global: use proper accessors for maybe_tree
A previous commit changed ->tree to ->maybe_tree throughout, which may
have worked at the time, but wasn't safe, because maybe_tree is loaded
lazily. This manifested itself in crashes when using the "follow" log
feature. The proper fix is to use the correct contextual accessors
everytime we want access to maybe_tree. Thankfully, the commit.cocci
script takes care of creating mostly-correct patches that we could then
fix up, resulting in this commit here.

Fixes: 255b78f ("git: update to v2.18.0")
Reviewed-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'ui-tree.c')
-rw-r--r--ui-tree.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ui-tree.c b/ui-tree.c index 84eb17d..1e4efb2 100644 --- a/ui-tree.c +++ b/ui-tree.c
@@ -370,12 +370,14 @@ void cgit_print_tree(const char *rev, char *path)
370 walk_tree_ctx.curr_rev = xstrdup(rev); 370 walk_tree_ctx.curr_rev = xstrdup(rev);
371 371
372 if (path == NULL) { 372 if (path == NULL) {
373 ls_tree(&commit->maybe_tree->object.oid, NULL, &walk_tree_ctx); 373 ls_tree(get_commit_tree_oid(commit), NULL, &walk_tree_ctx);
374 goto cleanup; 374 goto cleanup;
375 } 375 }
376 376
377 read_tree_recursive(the_repository, commit->maybe_tree, "", 0, 0, 377 read_tree_recursive(the_repository,
378 &paths, walk_tree, &walk_tree_ctx); 378 repo_get_commit_tree(the_repository, commit),
379 "", 0, 0,
380 &paths, walk_tree, &walk_tree_ctx);
379 if (walk_tree_ctx.state == 1) 381 if (walk_tree_ctx.state == 1)
380 ls_tail(); 382 ls_tail();
381 else if (walk_tree_ctx.state == 2) 383 else if (walk_tree_ctx.state == 2)