From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Sat, 9 Sep 2023 11:25:31 +0000 (+0100)
Subject: [Fix] Try to fix unzip function
X-Git-Tag: 3.7.1~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0b51255f334ced4362257fc2c93a48489c2ec55e;p=thirdparty%2Frspamd.git

[Fix] Try to fix unzip function
---

diff --git a/src/libutil/util.c b/src/libutil/util.c
index deba3e8076..d3c4721bdb 100644
--- a/src/libutil/util.c
+++ b/src/libutil/util.c
@@ -2295,21 +2295,20 @@ rspamd_fstring_gunzip(rspamd_fstring_t **in)
 	gsize total_out = 0;
 
 	do {
-		strm.next_out = out->str;
-		strm.avail_out = out->allocated;
+		strm.next_out = out->str + total_out;
+		strm.avail_out = out->allocated - total_out;
 
 		ret = inflate(&strm, Z_NO_FLUSH);
 		if (ret != Z_OK && ret != Z_STREAM_END && ret != Z_BUF_ERROR) {
 			break;
 		}
 
-		gsize out_size = out->allocated - strm.avail_out;
-		if (total_out + out_size > out->allocated) {
-			out = rspamd_fstring_grow(out, total_out + out_size);
+		gsize out_remain = strm.avail_out;
+		total_out = out->allocated - out_remain;
+		if (out_remain == 0 && ret != Z_STREAM_END) {
+			out = rspamd_fstring_grow(out, out->allocated * 2);
 		}
 
-		total_out += out_size;
-
 	} while (ret != Z_STREAM_END);
 
 	if (ret == Z_STREAM_END) {