aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2024-06-24 16:39:15 -0700
committerJunio C Hamano <gitster@pobox.com>2024-06-24 16:39:15 -0700
commit532083fd1609b840cb4076440800ed7b4f2d9df0 (patch)
treeb210a71be7d4804014d56dc5024a96fb3e755b59
parentMerge branch 'jc/worktree-git-path' (diff)
parentattr: fix msan issue in read_attr_from_index (diff)
downloadgit-532083fd1609b840cb4076440800ed7b4f2d9df0.tar.gz
git-532083fd1609b840cb4076440800ed7b4f2d9df0.zip
Merge branch 'kl/attr-read-attr-fromindex-msan-workaround'
Code clarification to avoid an appearance of using an uninitialized variable. * kl/attr-read-attr-fromindex-msan-workaround: attr: fix msan issue in read_attr_from_index
-rw-r--r--attr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/attr.c b/attr.c
index 300f994ba6..a2e0775f7e 100644
--- a/attr.c
+++ b/attr.c
@@ -865,7 +865,8 @@ static struct attr_stack *read_attr_from_index(struct index_state *istate,
stack = read_attr_from_blob(istate, &istate->cache[sparse_dir_pos]->oid, relative_path, flags);
} else {
buf = read_blob_data_from_index(istate, path, &size);
- stack = read_attr_from_buf(buf, size, path, flags);
+ if (buf)
+ stack = read_attr_from_buf(buf, size, path, flags);
}
return stack;
}