git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kyle Lippincott <spectral@google.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Karthik Nayak <karthik.188@gmail.com>,
	git@vger.kernel.org, ps@pks.im,  schwab@linux-m68k.org,
	phillip.wood123@gmail.com,
	 Christian Couder <chriscool@tuxfamily.org>,
	Jeff King <peff@peff.net>
Subject: Re: [PATCH] ref-iterator-seek: correctly initialize the prefix_state for a new level
Date: Wed, 23 Jul 2025 14:57:29 -0700	[thread overview]
Message-ID: <CAO_smVjUyOit66LaseHd=0dt6KgnTrCHbrO+oWU1L5Wd1z8Y7A@mail.gmail.com> (raw)
In-Reply-To: <xmqqldoelgnd.fsf_-_@gitster.g>

On Wed, Jul 23, 2025 at 2:51 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> When cache_ref_iterator_seek() "jumps" to a middle of the sorted ref
> list, it forgets to set the .prefix_state member of the new
> (i.e. deeper) level it just initialized.  This later causes
> cache_ref_iterator_advance() to look at this uninitialized member
> to base its decision on what to do next.
>
> Kyle Lippincott [*] and Jeff King noticed this with MSAN and
> Valgrind, and Karthik Nayak as the original author located exactly
> where the missing initialization is.
>
> [*] <CAO_smVg9TDakUnubepjPGmLyOzW6n8Z=MDbnZKvkwN2=kN2RRw@mail.gmail.com>
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Looks good to me, thanks!

> ---
>  refs/ref-cache.c | 1 +
>  1 file changed, 1 insertion(+)
>
>  * I had this as "fixup!" on top of your topic for quite a while and
>    forgot to ask you to send in an official fix.  As Kyle's
>    discovery was after the topic hit 'next' (understandable, as
>    their internal edition of Git is based on 'next'), we need a
>    separate fix on top.
>
>    To prepare for merging down the whole thing to 'master', I wrote
>    the proposed log message to help expedite the process.  Comments?
>
> diff --git a/refs/ref-cache.c b/refs/ref-cache.c
> index 1d95b56d40..ceef3a2008 100644
> --- a/refs/ref-cache.c
> +++ b/refs/ref-cache.c
> @@ -527,6 +527,7 @@ static int cache_ref_iterator_seek(struct ref_iterator *ref_iterator,
>                                 level = &iter->levels[iter->levels_nr++];
>                                 level->dir = dir;
>                                 level->index = -1;
> +                               level->prefix_state = PREFIX_CONTAINS_DIR;
>                         } else {
>                                 /* reduce the index so the leaf node is iterated over */
>                                 if (cmp <= 0 && !slash)
> --
> 2.50.1-521-gf11ee0bd80
>

  reply	other threads:[~2025-07-23 21:57 UTC|newest]

Thread overview: 102+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-01 15:03 [PATCH 0/4] for-each-ref: introduce seeking functionality via '--skip-until' Karthik Nayak
2025-07-01 15:03 ` [PATCH 1/4] refs: expose `ref_iterator` via 'refs.h' Karthik Nayak
2025-07-01 15:03 ` [PATCH 2/4] ref-cache: remove unused function 'find_ref_entry()' Karthik Nayak
2025-07-14 15:46   ` Junio C Hamano
2025-07-01 15:03 ` [PATCH 3/4] refs: selectively set prefix in the seek functions Karthik Nayak
2025-07-03  5:55   ` Patrick Steinhardt
2025-07-03  9:40     ` Karthik Nayak
2025-07-01 15:03 ` [PATCH 4/4] for-each-ref: introduce a '--skip-until' option Karthik Nayak
2025-07-03  5:55   ` Patrick Steinhardt
2025-07-03 10:02     ` Karthik Nayak
2025-07-03 10:59       ` Patrick Steinhardt
2025-07-01 17:08 ` [PATCH 0/4] for-each-ref: introduce seeking functionality via '--skip-until' Junio C Hamano
2025-07-02 16:45   ` Karthik Nayak
2025-07-01 21:37 ` Junio C Hamano
2025-07-02 18:19   ` Karthik Nayak
2025-07-03  8:41     ` Karthik Nayak
2025-07-02 14:14 ` Phillip Wood
2025-07-02 20:33   ` Karthik Nayak
2025-07-03  5:18     ` Patrick Steinhardt
2025-07-03  5:56       ` Junio C Hamano
2025-07-03  8:19         ` Patrick Steinhardt
2025-07-03  8:48           ` Karthik Nayak
2025-07-04 13:02 ` [PATCH v2 " Karthik Nayak
2025-07-04 13:02   ` [PATCH v2 1/4] refs: expose `ref_iterator` via 'refs.h' Karthik Nayak
2025-07-04 13:02   ` [PATCH v2 2/4] ref-cache: remove unused function 'find_ref_entry()' Karthik Nayak
2025-07-04 13:02   ` [PATCH v2 3/4] refs: selectively set prefix in the seek functions Karthik Nayak
2025-07-04 13:02   ` [PATCH v2 4/4] for-each-ref: introduce a '--skip-until' option Karthik Nayak
2025-07-07 15:30     ` Junio C Hamano
2025-07-07 18:31       ` Karthik Nayak
2025-07-04 13:41   ` [PATCH v2 0/4] for-each-ref: introduce seeking functionality via '--skip-until' Andreas Schwab
2025-07-04 14:02     ` Karthik Nayak
2025-07-04 14:52       ` Andreas Schwab
2025-07-04 14:58         ` Karthik Nayak
2025-07-04 15:55           ` Andreas Schwab
2025-07-07  8:52             ` Karthik Nayak
2025-07-04 16:39       ` Junio C Hamano
2025-07-07  8:59         ` Karthik Nayak
2025-07-07  9:45           ` Phillip Wood
2025-07-08 11:39             ` Karthik Nayak
2025-07-08 13:47 ` [PATCH v3 0/4] for-each-ref: introduce seeking functionality via '--start-after' Karthik Nayak
2025-07-08 13:47   ` [PATCH v3 1/4] refs: expose `ref_iterator` via 'refs.h' Karthik Nayak
2025-07-08 13:47   ` [PATCH v3 2/4] ref-cache: remove unused function 'find_ref_entry()' Karthik Nayak
2025-07-08 13:47   ` [PATCH v3 3/4] refs: selectively set prefix in the seek functions Karthik Nayak
2025-07-10  6:44     ` Patrick Steinhardt
2025-07-11  9:44       ` Karthik Nayak
2025-07-14 16:09       ` Junio C Hamano
2025-07-15  9:49         ` Karthik Nayak
2025-07-15 16:35           ` Junio C Hamano
2025-07-16 14:40             ` Karthik Nayak
2025-07-16 15:39               ` Junio C Hamano
2025-07-16 20:02               ` Junio C Hamano
2025-07-17  9:01                 ` Karthik Nayak
2025-07-17 17:31                   ` Junio C Hamano
2025-07-08 13:47   ` [PATCH v3 4/4] for-each-ref: introduce a '--start-after' option Karthik Nayak
2025-07-08 20:25     ` Junio C Hamano
2025-07-09  9:53       ` Karthik Nayak
2025-07-11 16:18 ` [PATCH v4 0/4] for-each-ref: introduce seeking functionality via '--start-after' Karthik Nayak
2025-07-11 16:18   ` [PATCH v4 1/4] refs: expose `ref_iterator` via 'refs.h' Karthik Nayak
2025-07-11 16:18   ` [PATCH v4 2/4] ref-cache: remove unused function 'find_ref_entry()' Karthik Nayak
2025-07-11 16:18   ` [PATCH v4 3/4] refs: selectively set prefix in the seek functions Karthik Nayak
2025-07-14 10:34     ` Christian Couder
2025-07-15  8:19       ` Karthik Nayak
2025-07-11 16:18   ` [PATCH v4 4/4] for-each-ref: introduce a '--start-after' option Karthik Nayak
2025-07-14 16:04     ` Christian Couder
2025-07-14 16:42       ` Junio C Hamano
2025-07-15  8:42       ` Karthik Nayak
2025-07-14 16:34   ` [PATCH v4 0/4] for-each-ref: introduce seeking functionality via '--start-after' Christian Couder
2025-07-14 16:49     ` Junio C Hamano
2025-07-15  9:49       ` Karthik Nayak
2025-07-15 11:28 ` [PATCH v5 0/5] " Karthik Nayak
2025-07-15 11:28   ` [PATCH v5 1/5] refs: expose `ref_iterator` via 'refs.h' Karthik Nayak
2025-07-15 11:28   ` [PATCH v5 2/5] ref-cache: remove unused function 'find_ref_entry()' Karthik Nayak
2025-07-17 14:48     ` Junio C Hamano
2025-07-17 19:31       ` Karthik Nayak
2025-07-17 20:32         ` Junio C Hamano
2025-07-15 11:28   ` [PATCH v5 3/5] refs: selectively set prefix in the seek functions Karthik Nayak
2025-07-17  2:09     ` Jeff King
2025-07-17 19:49       ` Karthik Nayak
2025-07-17 21:55         ` Jeff King
2025-07-15 11:28   ` [PATCH v5 4/5] ref-filter: remove unnecessary else clause Karthik Nayak
2025-07-15 11:28   ` [PATCH v5 5/5] for-each-ref: introduce a '--start-after' option Karthik Nayak
2025-07-17 15:31     ` Junio C Hamano
2025-07-22  8:07       ` Karthik Nayak
2025-07-15 19:00   ` [PATCH v5 0/5] for-each-ref: introduce seeking functionality via '--start-after' Junio C Hamano
2025-07-17  1:19     ` Kyle Lippincott
2025-07-17  1:54       ` Jeff King
2025-07-17 17:08         ` Kyle Lippincott
2025-07-17 19:26           ` Karthik Nayak
2025-07-17 19:35             ` Kyle Lippincott
2025-07-17 22:09               ` Jeff King
2025-07-17 22:16                 ` Jeff King
2025-07-21 14:27                 ` Karthik Nayak
2025-07-21 21:22                   ` Jeff King
2025-07-22  8:44                     ` Karthik Nayak
2025-07-17 22:21             ` Junio C Hamano
2025-07-23 21:51   ` [PATCH] ref-iterator-seek: correctly initialize the prefix_state for a new level Junio C Hamano
2025-07-23 21:57     ` Kyle Lippincott [this message]
2025-07-23 23:52     ` Jeff King
2025-07-24  8:12     ` Karthik Nayak
2025-07-24 17:01       ` Junio C Hamano
2025-07-24 22:11         ` [PATCH] ref-cache: set prefix_state when seeking Karthik Nayak
2025-07-24 22:30           ` Junio C Hamano

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='CAO_smVjUyOit66LaseHd=0dt6KgnTrCHbrO+oWU1L5Wd1z8Y7A@mail.gmail.com' \
    --to=spectral@google.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=karthik.188@gmail.com \
    --cc=peff@peff.net \
    --cc=phillip.wood123@gmail.com \
    --cc=ps@pks.im \
    --cc=schwab@linux-m68k.org \
    /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).