From: Junio C Hamano <gitster@pobox.com>
To: "René Scharfe" <l.s.r@web.de>
Cc: ZheNing Hu via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org,
"brian m. carlson" <sandals@crustytoothpaste.net>,
Christian Couder <christian.couder@gmail.com>,
ZheNing Hu <adlternative@gmail.com>
Subject: Re: [PATCH] read-cache.c: reduce unnecessary cache entry name copying
Date: Mon, 06 Jun 2022 10:23:06 -0700 [thread overview]
Message-ID: <xmqqy1y9905h.fsf@gitster.g> (raw)
In-Reply-To: <9195fe51-a696-1fb7-3617-a5b65358a806@web.de> (=?utf-8?Q?=22R?= =?utf-8?Q?en=C3=A9?= Scharfe"'s message of "Mon, 6 Jun 2022 11:48:13 +0200")
René Scharfe <l.s.r@web.de> writes:
>> diff --git a/read-cache.c b/read-cache.c
>> index 96ce489c7c5..e61af3a3d4d 100644
>> --- a/read-cache.c
>> +++ b/read-cache.c
>> @@ -1944,8 +1944,6 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,
>> ce->ce_namelen = len;
>> ce->index = 0;
>> oidread(&ce->oid, ondisk->data);
>> - memcpy(ce->name, name, len);
>> - ce->name[len] = '\0';
>
> This removal looks correct to me. The extra copying was added by
> 575fa8a3ed (read-cache: read data in a hash-independent way, 2019-02-19)
> but its commit message doesn't mention it.
I agree with the analysis. When we are prefix-compressing the
entry, name[] may be much shorter than len, so this memcpy() may
potentially be reading beyond the end of the on-disk buffer, so the
original code is not just redundant, but it may simply be wrong.
Thanks, both. Will queue.
>>
>> if (expand_name_field) {
>> if (copy_len)
>
> Some more context lines would help to see the redundancy; here they are:
>
> if (expand_name_field) {
> if (copy_len)
> memcpy(ce->name, previous_ce->name, copy_len);
> memcpy(ce->name + copy_len, name, len + 1 - copy_len);
> *ent_size = (name - ((char *)ondisk)) + len + 1 - copy_len;
> } else {
> memcpy(ce->name, name, len + 1);
> *ent_size = ondisk_ce_size(ce);
> }
>
>>
>> base-commit: ab336e8f1c8009c8b1aab8deb592148e69217085
prev parent reply other threads:[~2022-06-06 17:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-05 13:37 [PATCH] read-cache.c: reduce unnecessary cache entry name copying ZheNing Hu via GitGitGadget
2022-06-06 9:48 ` René Scharfe
2022-06-06 17:23 ` Junio C Hamano [this message]
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=xmqqy1y9905h.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=adlternative@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=l.s.r@web.de \
--cc=sandals@crustytoothpaste.net \
/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).