From: Junio C Hamano <gitster@pobox.com>
To: "Kyle Lippincott via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Kyle Lippincott <spectral@google.com>
Subject: Re: [PATCH] attr: fix msan issue in read_attr_from_index
Date: Mon, 17 Jun 2024 13:08:24 -0700 [thread overview]
Message-ID: <xmqqmsnj5o3r.fsf@gitster.g> (raw)
In-Reply-To: <pull.1747.git.1718654424683.gitgitgadget@gmail.com> (Kyle Lippincott via GitGitGadget's message of "Mon, 17 Jun 2024 20:00:24 +0000")
"Kyle Lippincott via GitGitGadget" <gitgitgadget@gmail.com> writes:
> Make the call to `read_attr_from_buf` conditional on `buf` being
> non-NULL, ensuring that `size` is not read if it's never set.
Makes good sense.
> Signed-off-by: Kyle Lippincott <spectral@google.com>
> ---
> attr: fix msan issue in read_attr_from_index
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1747%2Fspectral54%2Fmsan-attr-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1747/spectral54/msan-attr-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1747
>
> attr.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/attr.c b/attr.c
> index 300f994ba6e..a2e0775f7e5 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;
> }
Not directly related to the issue this patch addresses, but I notice
that both buf and size variables have unnecesarily wide scope. As a
clean-up we may want to move their declaration into this "} else {"
block. But that is totally outside the scope (no pun intended) of
this patch.
Will queue.
Thanks.
next prev parent reply other threads:[~2024-06-17 20:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-17 20:00 [PATCH] attr: fix msan issue in read_attr_from_index Kyle Lippincott via GitGitGadget
2024-06-17 20:08 ` Junio C Hamano [this message]
2024-06-17 20:30 ` Junio C Hamano
2024-06-17 21:14 ` Junio C Hamano
2024-06-17 21:17 ` Kyle Lippincott
2024-06-18 23:39 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmsnj5o3r.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=spectral@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).