aboutsummaryrefslogtreecommitdiffstats
path: root/ui-blame.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-blame.c
parent892ba8c3cc0617d2087a2337d8c6e71524d7b49c (diff)
downloadcgit-6a8d6d4b5021af6c90ca0da806691987df449469.tar.gz
cgit-6a8d6d4b5021af6c90ca0da806691987df449469.tar.bz2
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-blame.c')
-rw-r--r--ui-blame.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui-blame.c b/ui-blame.c
index 644c30a..f28eea0 100644
--- a/ui-blame.c
+++ b/ui-blame.c
@@ -290,8 +290,10 @@ void cgit_print_blame(void)
290 walk_tree_ctx.match_baselen = (path_items.match) ? 290 walk_tree_ctx.match_baselen = (path_items.match) ?
291 basedir_len(path_items.match) : -1; 291 basedir_len(path_items.match) : -1;
292 292
293 read_tree_recursive(the_repository, commit->maybe_tree, "", 0, 0, 293 read_tree_recursive(the_repository,
294 &paths, walk_tree, &walk_tree_ctx); 294 repo_get_commit_tree(the_repository, commit),
295 "", 0, 0,
296 &paths, walk_tree, &walk_tree_ctx);
295 if (!walk_tree_ctx.state) 297 if (!walk_tree_ctx.state)
296 cgit_print_error_page(404, "Not found", "Not found"); 298 cgit_print_error_page(404, "Not found", "Not found");
297 else if (walk_tree_ctx.state == 2) 299 else if (walk_tree_ctx.state == 2)