[RFC PATCH 1/2] object-file API: fix obscure unpack_loose_header() return
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- May 19, 2022, 20:09 UTC
- Message-ID
- <RFC-patch-1.2-297bea05118-20220519T195055Z-avarab@gmail.com>
- In-Reply-To
- <RFC-cover-0.2-00000000000-20220519T195055Z-avarab@gmail.com>
Fix an obscure unpack_loose_header() return value. In my 5848fb11acd (object-file.c: return ULHR_TOO_LONG on "header too long", 2021-10-01) this API learned to return ULHR_TOO_LONG, but should not have done so in the case of parsing a long header where the terminating \0 cannot be found. We should return a ULHR_BAD in that case.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- cache.h | 3 +-- object-file.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cache.h b/cache.h index 595582becc8..aa24d5a609f 100644 --- a/cache.h +++ b/cache.h @@ -1342,8 +1342,7 @@ int git_open_cloexec(const char *name, int flags); * "hdrbuf" argument is non-NULL. This is intended for use with * OBJECT_INFO_ALLOW_UNKNOWN_TYPE to extract the bad type for (error) * reporting. The full header will be extracted to "hdrbuf" for use - * with parse_loose_header(), ULHR_TOO_LONG will still be returned - * from this function to indicate that the header was too long. + * with parse_loose_header(). */ enum unpack_loose_header_result { ULHR_OK, diff --git a/object-file.c b/object-file.c index b5d1d12b68a..1babe9791f6 100644 --- a/object-file.c +++ b/object-file.c @@ -1301,7 +1301,7 @@ enum unpack_loose_header_result unpack_loose_header(git_zstream *stream, stream->next_out = buffer; stream->avail_out = bufsiz; } while (status != Z_STREAM_END); - return ULHR_TOO_LONG; + return ULHR_BAD; } static void *unpack_loose_rest(git_zstream *stream,
-- 2.36.1.957.g2c13267e09b