X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b2999e457fd3f0e4ca90c6bcc5c06e112be72c3c..ef55c686bcb61d8c83e79eb73ed15639e4345d5c:/io.c

diff --git a/io.c b/io.c
index f948147e..6cdbe6bf 100644
--- a/io.c
+++ b/io.c
@@ -407,8 +407,8 @@ static void mplex_write(int fd, enum logcode code, char *buf, int len)
 
 	SIVAL(buffer, 0, ((MPLEX_BASE + (int)code)<<24) + len);
 
-	if (n > (sizeof(buf)-4)) {
-		n = sizeof(buf)-4;
+	if (n > (sizeof(buffer)-4)) {
+		n = sizeof(buffer)-4;
 	}
 
 	memcpy(&buffer[4], buf, n);
@@ -417,7 +417,9 @@ static void mplex_write(int fd, enum logcode code, char *buf, int len)
 	len -= n;
 	buf += n;
 
-	writefd_unbuffered(fd, buf, len);
+	if (len) {
+		writefd_unbuffered(fd, buf, len);
+	}
 }
 
 
@@ -597,3 +599,4 @@ void io_close_input(int fd)
 {
 	buffer_f_in = -1;
 }
+