From: Wayne Davison <wayned@samba.org>
Date: Sat, 14 Nov 2009 17:51:26 +0000 (-0800)
Subject: Tweaked sizing checks in perform_io().
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/b82d8c9d1ae9d7c97da149d5366b61da972a091c?ds=sidebyside

Tweaked sizing checks in perform_io().
---

diff --git a/io.c b/io.c
index 7cc4d62a..b27e434d 100644
--- a/io.c
+++ b/io.c
@@ -541,8 +541,8 @@ static char *perform_io(size_t needed, int flags)
 		if (DEBUG_GTE(IO, 3)) {
 			rprintf(FINFO, "[%s] perform_io(%ld, outroom) needs to flush %ld\n",
 				who_am_i(), (long)needed,
-				iobuf.out.len > iobuf.out.size - needed
-				? (long)iobuf.out.len - (iobuf.out.size - needed) : 0L);
+				iobuf.out.len + needed > iobuf.out.size
+				? (long)(iobuf.out.len + needed - iobuf.out.size) : 0L);
 		}
 		break;
 
@@ -557,8 +557,8 @@ static char *perform_io(size_t needed, int flags)
 		if (DEBUG_GTE(IO, 3)) {
 			rprintf(FINFO, "[%s] perform_io(%ld, msgroom) needs to flush %ld\n",
 				who_am_i(), (long)needed,
-				iobuf.out.len > iobuf.msg.size - needed
-				? (long)iobuf.out.len - (iobuf.msg.size - needed) : 0L);
+				iobuf.msg.len + needed > iobuf.msg.size
+				? (long)(iobuf.msg.len + needed - iobuf.msg.size) : 0L);
 		}
 		break;
 
@@ -578,11 +578,13 @@ static char *perform_io(size_t needed, int flags)
 				goto double_break;
 			break;
 		case PIO_NEED_OUTROOM:
-			if (iobuf.out.len <= iobuf.out.size - needed)
+			/* Note that iobuf.out_empty_len doesn't factor into this check
+			 * because iobuf.out.len already holds any needed header len. */
+			if (iobuf.out.len + needed <= iobuf.out.size)
 				goto double_break;
 			break;
 		case PIO_NEED_MSGROOM:
-			if (iobuf.msg.len <= iobuf.msg.size - needed)
+			if (iobuf.msg.len + needed <= iobuf.msg.size)
 				goto double_break;
 			break;
 		}