From: Wayne Davison <wayned@samba.org>
Date: Tue, 13 Sep 2011 00:56:23 +0000 (-0700)
Subject: Make sure other early exit calls can't hang in noop_io_until_death().
X-Git-Tag: v3.1.0pre1~82
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=847ddaf071002ced679ecafab164692091e8b3c0;p=thirdparty%2Frsync.git

Make sure other early exit calls can't hang in noop_io_until_death().
---

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;