From: Wayne Davison <wayned@samba.org>
Date: Mon, 21 Dec 2009 18:13:52 +0000 (-0800)
Subject: Don't die if inflate() returns Z_BUF_ERROR in see_deflate_token().
X-Git-Tag: v3.1.0pre1~256
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4286ea6036efbe36b53229f209ed8614bd55b2e1;p=thirdparty%2Frsync.git

Don't die if inflate() returns Z_BUF_ERROR in see_deflate_token().
---

diff --git a/token.c b/token.c
index be882e9f..abc0ef5e 100644
--- a/token.c
+++ b/token.c
@@ -598,7 +598,7 @@ static void see_deflate_token(char *buf, int32 len)
 		rx_strm.next_out = (Bytef *)dbuf;
 		rx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
 		r = inflate(&rx_strm, Z_SYNC_FLUSH);
-		if (r != Z_OK) {
+		if (r != Z_OK && r != Z_BUF_ERROR) {
 			rprintf(FERROR, "inflate (token) returned %d\n", r);
 			exit_cleanup(RERR_STREAMIO);
 		}