public inbox for git@vger.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org,  Aaron Plattner <aplattner@nvidia.com>,
	 Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>,
	 Toon Claes <toon@iotcl.com>,
	 Karthik Nayak <karthik.188@gmail.com>,
	 Matt Smiley <msmiley@gitlab.com>
Subject: Re: [PATCH v5 2/7] packfile: always declare object info to be OI_PACKED
Date: Mon, 12 Jan 2026 06:54:07 -0800	[thread overview]
Message-ID: <xmqqzf6inapc.fsf@gitster.g> (raw)
In-Reply-To: <20260112-b4-pks-odb-read-object-info-improvements-v5-2-9a6124e95bf2@pks.im> (Patrick Steinhardt's message of "Mon, 12 Jan 2026 10:00:42 +0100")

Patrick Steinhardt <ps@pks.im> writes:

> Note that this also fixes a segfault introduced in 8c1b84bc97
> (streaming: move logic to read packed objects streams into backend,
> 2025-11-23), which refactors how we stream packed objects. The intent is
> to only read packed objects in case they are stored non-deltified as
> we'd otherwise have to deflate them first. But the check for whether or
> not the object is stored as a delta was unconditionally done via
> `oi.u.packed.is_delta`, which is only valid in case `oi.whence` is
> `OI_PACKED`. But under some circumstances we got `OI_DBCACHED` here,
> which means that none of the `oi.u.packed` fields were initialized at
> all. Consequently, we assumed the object was not stored as a delta, and
> then try to read the object from `oi.u.packed.pack`, which is a `NULL`
> pointer and thus causes a segfault.
>
> Add a test case for this issue so that this cannot regress in the
> future anymore.

Great.  Thanks.  Will requeue.

> Reported-by: Matt Smiley <msmiley@gitlab.com>
> Signed-off-by: Patrick Steinhardt <ps@pks.im>
> ---
>  odb.h                  |  1 -
>  packfile.c             |  3 +--
>  t/t5003-archive-zip.sh | 34 ++++++++++++++++++++++++++++++++++
>  3 files changed, 35 insertions(+), 3 deletions(-)
>
> diff --git a/odb.h b/odb.h
> index 014cd9585a..73b0b87ad5 100644
> --- a/odb.h
> +++ b/odb.h
> @@ -330,7 +330,6 @@ struct object_info {
>  		OI_CACHED,
>  		OI_LOOSE,
>  		OI_PACKED,
> -		OI_DBCACHED
>  	} whence;


  reply	other threads:[~2026-01-12 14:54 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-18  6:28 [PATCH 0/8] Improvements for reading object info Patrick Steinhardt
2025-12-18  6:28 ` [PATCH 1/8] object-file: always set OI_LOOSE when " Patrick Steinhardt
2025-12-18  6:28 ` [PATCH 2/8] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2025-12-18  7:23   ` Junio C Hamano
2025-12-18  9:10     ` Patrick Steinhardt
2025-12-18  6:28 ` [PATCH 3/8] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2025-12-18  6:28 ` [PATCH 4/8] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2025-12-18  7:32   ` Junio C Hamano
2025-12-18  6:28 ` [PATCH 5/8] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2025-12-18  6:28 ` [PATCH 6/8] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2025-12-18  6:28 ` [PATCH 7/8] packfile: fix short-circuiting of empty requests Patrick Steinhardt
2025-12-18  6:28 ` [PATCH 8/8] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
2025-12-18  8:09 ` [PATCH 0/8] Improvements for reading object info Junio C Hamano
2025-12-18  8:30   ` Patrick Steinhardt
2025-12-18 10:54 ` [PATCH v2 0/7] " Patrick Steinhardt
2025-12-18 10:54   ` [PATCH v2 1/7] object-file: always set OI_LOOSE when " Patrick Steinhardt
2025-12-18 10:54   ` [PATCH v2 2/7] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2026-01-05 14:29     ` Toon Claes
2025-12-18 10:54   ` [PATCH v2 3/7] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2026-01-05 15:35     ` Toon Claes
2026-01-06  6:34       ` Patrick Steinhardt
2025-12-18 10:54   ` [PATCH v2 4/7] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2025-12-30 17:03     ` Kristoffer Haugsbakk
2026-01-05 11:38       ` Patrick Steinhardt
2025-12-18 10:54   ` [PATCH v2 5/7] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2025-12-18 10:54   ` [PATCH v2 6/7] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2025-12-18 10:54   ` [PATCH v2 7/7] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
2026-01-06  6:54 ` [PATCH v3 0/7] Improvements for reading object info Patrick Steinhardt
2026-01-06  6:54   ` [PATCH v3 1/7] object-file: always set OI_LOOSE when " Patrick Steinhardt
2026-01-07  8:50     ` Karthik Nayak
2026-01-07 11:27       ` Patrick Steinhardt
2026-01-06  6:54   ` [PATCH v3 2/7] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2026-01-06  6:54   ` [PATCH v3 3/7] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2026-01-07 10:12     ` Karthik Nayak
2026-01-06  6:55   ` [PATCH v3 4/7] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2026-01-06  6:55   ` [PATCH v3 5/7] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2026-01-06  6:55   ` [PATCH v3 6/7] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2026-01-06  6:55   ` [PATCH v3 7/7] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
2026-01-07 10:17   ` [PATCH v3 0/7] Improvements for reading object info Karthik Nayak
2026-01-07 13:07 ` [PATCH v4 " Patrick Steinhardt
2026-01-07 13:08   ` [PATCH v4 1/7] object-file: always set OI_LOOSE when " Patrick Steinhardt
2026-01-08  9:30     ` Karthik Nayak
2026-01-07 13:08   ` [PATCH v4 2/7] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2026-01-07 13:08   ` [PATCH v4 3/7] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2026-01-07 13:08   ` [PATCH v4 4/7] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2026-01-07 13:08   ` [PATCH v4 5/7] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2026-01-07 13:08   ` [PATCH v4 6/7] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2026-01-07 13:08   ` [PATCH v4 7/7] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt
2026-01-08  9:30   ` [PATCH v4 0/7] Improvements for reading object info Karthik Nayak
2026-01-12  9:00 ` [PATCH v5 " Patrick Steinhardt
2026-01-12  9:00   ` [PATCH v5 1/7] object-file: always set OI_LOOSE when " Patrick Steinhardt
2026-01-12  9:00   ` [PATCH v5 2/7] packfile: always declare object info to be OI_PACKED Patrick Steinhardt
2026-01-12 14:54     ` Junio C Hamano [this message]
2026-01-12  9:00   ` [PATCH v5 3/7] packfile: extend `is_delta` field to allow for "unknown" state Patrick Steinhardt
2026-01-12  9:00   ` [PATCH v5 4/7] packfile: always populate pack-specific info when reading object info Patrick Steinhardt
2026-01-12  9:00   ` [PATCH v5 5/7] packfile: disentangle return value of `packed_object_info()` Patrick Steinhardt
2026-01-12  9:00   ` [PATCH v5 6/7] packfile: skip unpacking object header for disk size requests Patrick Steinhardt
2026-01-12  9:00   ` [PATCH v5 7/7] packfile: drop repository parameter from `packed_object_info()` Patrick Steinhardt

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=xmqqzf6inapc.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=aplattner@nvidia.com \
    --cc=git@vger.kernel.org \
    --cc=karthik.188@gmail.com \
    --cc=kristofferhaugsbakk@fastmail.com \
    --cc=msmiley@gitlab.com \
    --cc=ps@pks.im \
    --cc=toon@iotcl.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