[PATCH v3 07/15] sign-compare: 32-bit support
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Dec 5, 2024, 09:36 UTC
- Message-ID
- <20241205-pks-sign-compare-v3-7-e211ee089717@pks.im>
- In-Reply-To
- <20241205-pks-sign-compare-v3-0-e211ee089717@pks.im>
From: Junio C Hamano <gitster@pobox.com>
On 32-bit platforms, ssize_t may be "int" while size_t may be "unsigned int". At times we compare the number of bytes we read stored in a ssize_t variable with "unsigned int", but that is done after we check that we did not get an error return (which is negative---and that is the whole reason why we used ssize_t and not size_t), so these comparisons are safe.
But compilers may not realize that. Cast these to size_t to work around the false positives. On platforms with size_t/ssize_t wider than a normal int, this won't be an issue.
Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Patrick Steinhardt <ps@pks.im> --- csum-file.c | 3 +-- pkt-line.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/csum-file.c b/csum-file.c index c14bacc7f9e5f56fcdb06a3abc7ac9babc45041a..c8ec7b73e640c00b895c1b3ba92f052012a680e0 100644 --- a/csum-file.c +++ b/csum-file.c @@ -9,7 +9,6 @@ */ #define USE_THE_REPOSITORY_VARIABLE -#define DISABLE_SIGN_COMPARE_WARNINGS #include "git-compat-util.h" #include "progress.h" @@ -24,7 +23,7 @@ static void verify_buffer_or_die(struct hashfile *f, if (ret < 0) die_errno("%s: sha1 file read error", f->name); - if (ret != count) + if ((size_t)ret != (size_t)count) die("%s: sha1 file truncated", f->name); if (memcmp(buf, f->check_buffer, count)) die("sha1 file '%s' validation error", f->name); diff --git a/pkt-line.c b/pkt-line.c index 90ea2b6974b1d0957cfdc5e2f9a2c30720723f12..f48b558ad23dd99f334d2d60e954ce9a83ac6114 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -363,7 +363,7 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size, } /* And complain if we didn't get enough bytes to satisfy the read. */ - if (ret != size) { + if ((size_t)ret != (size_t)size) { if (options & PACKET_READ_GENTLE_ON_EOF) return -1;
-- 2.47.0.366.g5daf58cba8.dirty