aboutsummaryrefslogtreecommitdiffstats
path: root/io.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2011-09-12 17:56:23 -0700
committerWayne Davison <wayned@samba.org>2011-09-12 17:56:23 -0700
commit847ddaf071002ced679ecafab164692091e8b3c0 (patch)
tree14b366023eb7f7365f1a459c7240750941a67f60 /io.c
parentc4c5dc68b9259cef9bcab5f8589320d6fde4a5f9 (diff)
downloadandroid_external_rsync-847ddaf071002ced679ecafab164692091e8b3c0.tar.gz
android_external_rsync-847ddaf071002ced679ecafab164692091e8b3c0.tar.bz2
android_external_rsync-847ddaf071002ced679ecafab164692091e8b3c0.zip
Make sure other early exit calls can't hang in noop_io_until_death().
Diffstat (limited to 'io.c')
-rw-r--r--io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/io.c b/io.c
index b4e0a682..23e7822e 100644
--- a/io.c
+++ b/io.c
@@ -912,7 +912,7 @@ void noop_io_until_death(void)
{
char buf[1024];
- if (!iobuf.in.buf || !iobuf.out.buf || iobuf.in_fd == -1 || iobuf.out_fd == -1)
+ if (!iobuf.in.buf || !iobuf.out.buf || iobuf.in_fd < 0 || iobuf.out_fd < 0 || kluge_around_eof)
return;
kluge_around_eof = 2;