[PATCH 1/2] correct error messages for NULL packet_read_line()
- From
Jon Simons <jon@jonsimons.org>
- Date
- Feb 8, 2018, 18:47 UTC
- Message-ID
- <1518115670-2646-2-git-send-email-jon@jonsimons.org>
- In-Reply-To
- <1518115670-2646-1-git-send-email-jon@jonsimons.org>
From: Jeff King <peff@peff.net>
The packet_read_line() function dies if it gets an unexpected EOF. It only returns NULL if we get a flush packet (or technically, a zero-length "0004" packet, but nobody is supposed to send those, and they are indistinguishable from a flush in this interface).
Let's correct error messages which claim an unexpected EOF; it's really an unexpected flush packet.
While we're here, let's also check "!line" instead of "!len" in the second case. The two events should always coincide, but checking "!line" makes it more obvious that we are not about to dereference NULL.
Signed-off-by: Jeff King <peff@peff.net> --- builtin/archive.c | 2 +- fetch-pack.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/archive.c b/builtin/archive.c index f863465..73971d0 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -55,7 +55,7 @@ static int run_remote_archiver(int argc, const char **argv, buf = packet_read_line(fd[0], NULL); if (!buf) - die(_("git archive: expected ACK/NAK, got EOF")); + die(_("git archive: expected ACK/NAK, got a flush packet")); if (strcmp(buf, "ACK")) { if (starts_with(buf, "NACK ")) die(_("git archive: NACK %s"), buf + 5); diff --git a/fetch-pack.c b/fetch-pack.c index a376b4e..1b7cd6b 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -262,8 +262,8 @@ static enum ack_type get_ack(int fd, struct object_id *result_oid) char *line = packet_read_line(fd, &len); const char *arg; - if (!len) - die(_("git fetch-pack: expected ACK/NAK, got EOF")); + if (!line) + die(_("git fetch-pack: expected ACK/NAK, got a flush packet")); if (!strcmp(line, "NAK")) return NAK; if (skip_prefix(line, "ACK ", &arg)) {
-- 2.1.4