summaryrefslogtreecommitdiff
path: root/pkt-line.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-09-27 06:00:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-27 06:45:24 (GMT)
commit61d36330b422237b6be9581cdbade07782ab61a8 (patch)
tree3992d5a85c03b6d88924c10f7a79b252e44c36be /pkt-line.c
parenta1f3515da74504db0a046759d9ac1615a1d5f4b8 (diff)
downloadgit-61d36330b422237b6be9581cdbade07782ab61a8.zip
git-61d36330b422237b6be9581cdbade07782ab61a8.tar.gz
git-61d36330b422237b6be9581cdbade07782ab61a8.tar.bz2
prefer "!=" when checking read_in_full() result
Comparing the result of read_in_full() using less-than is potentially dangerous, as a negative return value may be converted to an unsigned type and be considered a success. This is discussed further in 561598cfcf (read_pack_header: handle signed/unsigned comparison in read result, 2017-09-13). Each of these instances is actually fine in practice: - in get-tar-commit-id, the HEADERSIZE macro expands to a signed integer. If it were switched to an unsigned type (e.g., a size_t), then it would be a bug. - the other two callers check for a short read only after handling a negative return separately. This is a fine practice, but we'd prefer to model "!=" as a general rule. So all of these cases can be considered cleanups and not actual bugfixes. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pkt-line.c')
-rw-r--r--pkt-line.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkt-line.c b/pkt-line.c
index 647bbd3..93ea311 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -258,7 +258,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 (ret != size) {
if (options & PACKET_READ_GENTLE_ON_EOF)
return -1;