about summary refs log tree commit diff stats
path: root/ui-log.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-log.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-log.c')
-rw-r--r--ui-log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-log.c b/ui-log.c index dc5cb1e..2939c01 100644 --- a/ui-log.c +++ b/ui-log.c
@@ -153,8 +153,8 @@ static int show_commit(struct commit *commit, struct rev_info *revs)
153 rem_lines = 0; 153 rem_lines = 0;
154 154
155 revs->diffopt.flags.recursive = 1; 155 revs->diffopt.flags.recursive = 1;
156 diff_tree_oid(&parent->maybe_tree->object.oid, 156 diff_tree_oid(get_commit_tree_oid(parent),
157 &commit->maybe_tree->object.oid, 157 get_commit_tree_oid(commit),
158 "", &revs->diffopt); 158 "", &revs->diffopt);
159 diffcore_std(&revs->diffopt); 159 diffcore_std(&revs->diffopt);
160 160