diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:33:54 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:33:55 -0800 |
| commit | 2fb346c06a0160cac185ad57368c04c17c2578ac (patch) | |
| tree | 2574f86d599946d9a364f3103578696013091f15 /builtin | |
| parent | Merge branch 'js/fix-merge-arg-quoting-in-rebase-p' (diff) | |
| parent | always check for NULL return from packet_read_line() (diff) | |
| download | tgif-2fb346c06a0160cac185ad57368c04c17c2578ac.tar.xz | |
Merge branch 'js/packet-read-line-check-null'
Some low level protocol codepath could crash when they get an
unexpected flush packet, which is now fixed.
* js/packet-read-line-check-null:
always check for NULL return from packet_read_line()
correct error messages for NULL packet_read_line()
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/archive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/archive.c b/builtin/archive.c index f863465a0f..73971d0dd2 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); |