about summary refs log tree commit diff stats
path: root/ui-plain.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-plain.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-plain.c')
-rw-r--r--ui-plain.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/ui-plain.c b/ui-plain.c index b73c1cf..2a7b18c 100644 --- a/ui-plain.c +++ b/ui-plain.c
@@ -193,13 +193,14 @@ void cgit_print_plain(void)
193 if (!path_items.match) { 193 if (!path_items.match) {
194 path_items.match = ""; 194 path_items.match = "";
195 walk_tree_ctx.match_baselen = -1; 195 walk_tree_ctx.match_baselen = -1;
196 print_dir(&commit->maybe_tree->object.oid, "", 0, ""); 196 print_dir(get_commit_tree_oid(commit), "", 0, "");
197 walk_tree_ctx.match = 2; 197 walk_tree_ctx.match = 2;
198 } 198 }
199 else 199 else
200 walk_tree_ctx.match_baselen = basedir_len(path_items.match); 200 walk_tree_ctx.match_baselen = basedir_len(path_items.match);
201 read_tree_recursive(the_repository, commit->maybe_tree, 201 read_tree_recursive(the_repository,
202 "", 0, 0, &paths, walk_tree, &walk_tree_ctx); 202 repo_get_commit_tree(the_repository, commit),
203 "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
203 if (!walk_tree_ctx.match) 204 if (!walk_tree_ctx.match)
204 cgit_print_error_page(404, "Not found", "Not found"); 205 cgit_print_error_page(404, "Not found", "Not found");
205 else if (walk_tree_ctx.match == 2) 206 else if (walk_tree_ctx.match == 2)