[gentoo-commits] repo/gentoo:master commit in: mail-filter/rspamd/, mail-filter/rspamd/files/

["Sam James" <sam@gentoo.org>]

commit:     0507e5274d19d90e15aad64aa7ab4f26189c7edc
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Mon Aug  7 11:17:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  7 17:22:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0507e527

mail-filter/rspamd: backport memory leak fix

This backports fix from upstream commit ffbab4fbf218 ("[CritFix] Fix
leak in `gzip` function").

Upstream-Issue: https://github.com/rspamd/rspamd/issues/4564
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Closes: https://github.com/gentoo/gentoo/pull/32209
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../rspamd/files/rspamd-3.6-memleak-fix.patch      | 36 ++++++++++++++++++++++
 .../{rspamd-3.6.ebuild => rspamd-3.6-r1.ebuild}    |  3 ++
 2 files changed, 39 insertions(+)

diff --git a/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
new file mode 100644
index 000000000000..f372b79de7c7
--- /dev/null
+++ b/mail-filter/rspamd/files/rspamd-3.6-memleak-fix.patch
@@ -0,0 +1,36 @@
+From ffbab4fbf218514845b8e5209aec044621b1f460 Mon Sep 17 00:00:00 2001
+From: Vsevolod Stakhov <vsevolod@rspamd.com>
+Date: Sun, 6 Aug 2023 18:33:37 +0100
+Subject: [PATCH] [CritFix] Fix leak in `gzip` function
+
+Upstream-Issue: https://github.com/rspamd/rspamd/issues/4564
+
+diff --git a/src/libutil/util.c b/src/libutil/util.c
+index 4be7cc620..deba3e807 100644
+--- a/src/libutil/util.c
++++ b/src/libutil/util.c
+@@ -2231,6 +2231,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
+ 	strm.avail_out = sizeof(temp) > buf->allocated ? buf->allocated : sizeof(temp);
+ 	ret = deflate(&strm, Z_FINISH);
+ 	if (ret == Z_STREAM_ERROR) {
++		deflateEnd(&strm);
+ 		return FALSE;
+ 	}
+ 
+@@ -2247,6 +2248,8 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
+ 		if (ret != Z_BUF_ERROR || strm.avail_in == 0) {
+ 			buf->len = strm.next_out - (unsigned char *) buf->str;
+ 			*in = buf;
++			deflateEnd(&strm);
++
+ 			return ret == Z_STREAM_END;
+ 		}
+ 	}
+@@ -2267,6 +2270,7 @@ rspamd_fstring_gzip(rspamd_fstring_t **in)
+ 	g_free(hold);
+ 	buf->len = strm.next_out - (unsigned char *) buf->str;
+ 	*in = buf;
++	deflateEnd(&strm);
+ 
+ 	return ret == Z_STREAM_END;
+ }

diff --git a/mail-filter/rspamd/rspamd-3.6.ebuild b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
similarity index 97%
rename from mail-filter/rspamd/rspamd-3.6.ebuild
rename to mail-filter/rspamd/rspamd-3.6-r1.ebuild
index fb768118313d..dba607175345 100644
--- a/mail-filter/rspamd/rspamd-3.6.ebuild
+++ b/mail-filter/rspamd/rspamd-3.6-r1.ebuild
@@ -72,6 +72,9 @@ PATCHES=(
 	"${FILESDIR}/rspamd-3.6-unbundle-lua.patch"
 	"${FILESDIR}/rspamd-3.6-unbundle-snowball.patch"
 	"${FILESDIR}/rspamd-3.6-fix-tests.patch"
+
+	# see https://github.com/rspamd/rspamd/issues/4564
+	"${FILESDIR}/${P}-memleak-fix.patch"
 )
 
 src_prepare() {