From: Junio C Hamano <gitster@pobox•com>
To: Git Mailing List <git@vger•kernel.org>
Cc: Johannes Sixt <j6t@kdbg•org>
Subject: Re: [PATCH] stream_to_pack: xread does not guarantee to read all requested bytes
Date: Tue, 20 Aug 2013 11:52:28 -0700 [thread overview]
Message-ID: <xmqq4nak6vpv.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <xmqqsiy476h4.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Tue, 20 Aug 2013 08:00:07 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> I wonder if there are more like this broken caller or xread and/or
> xwrite.
Here is a result of a quick audit (of 1.8.0.x codebase).
As xwrite() will not be splitting a single-byte request, the patch
to cat-file is more or less a theoretical fix, but if writing the
date string can fail in I/O error, writing a terminating LF after it
can fail the same way, so we should be consistent.
Everybody supports the side-band tranfer these days, so the patches
to receive-pack and upload-pack are also theoretical fixes, I
think. Note that in the more recent codebase, safe_write() is gone
and we use write_or_die() instead in upload-pack.
builtin/cat-file.c | 2 +-
builtin/receive-pack.c | 2 +-
upload-pack.c | 5 -----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 00528dd..4beb4d8 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -63,7 +63,7 @@ static void pprint_tag(const unsigned char *sha1, const char *buf, unsigned long
tz = strtol(ep, NULL, 10);
sp = show_date(date, tz, 0);
write_or_die(1, sp, strlen(sp));
- xwrite(1, "\n", 1);
+ write_or_die(1, "\n", 1);
break;
}
}
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index ff781fe..a41740d 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -202,7 +202,7 @@ static void report_message(const char *prefix, const char *err, va_list params)
if (use_sideband)
send_sideband(1, 2, msg, sz, use_sideband);
else
- xwrite(2, msg, sz);
+ write_in_full(2, msg, sz);
}
static void rp_warning(const char *err, ...)
diff --git a/upload-pack.c b/upload-pack.c
index 2e90ccb..7a3e4fd 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -64,11 +64,6 @@ static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
if (fd == 3)
/* emergency quit */
fd = 2;
- if (fd == 2) {
- /* XXX: are we happy to lose stuff here? */
- xwrite(fd, data, sz);
- return sz;
- }
return safe_write(fd, data, sz);
}
next prev parent reply other threads:[~2013-08-20 18:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-20 9:15 [PATCH] stream_to_pack: xread does not guarantee to read all requested bytes Johannes Sixt
2013-08-20 15:00 ` Junio C Hamano
2013-08-20 15:16 ` Antoine Pelisse
2013-08-20 18:27 ` Junio C Hamano
2013-08-20 18:27 ` Johannes Sixt
2013-08-20 18:23 ` Johannes Sixt
2013-08-20 18:52 ` Junio C Hamano [this message]
2013-08-20 19:37 ` Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4nak6vpv.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j6t@kdbg$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox