commit:     a3d8d8adbd38e235b75232ac2e42741d03e0de65
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 12:50:54 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 12:52:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d8d8ad

mail-mta/exim-4.94.2-r11: 3rd attempt at CVE patch

Fix another combination in which the code can be compiled.  Hopefully
3rd time is the charm or something.

Closes: https://bugs.gentoo.org/877641
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 mail-mta/exim/{exim-4.94.2-r10.ebuild => exim-4.94.2-r11.ebuild} | 0
 mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch                | 4 +++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mail-mta/exim/exim-4.94.2-r10.ebuild 
b/mail-mta/exim/exim-4.94.2-r11.ebuild
similarity index 100%
rename from mail-mta/exim/exim-4.94.2-r10.ebuild
rename to mail-mta/exim/exim-4.94.2-r11.ebuild

diff --git a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch 
b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
index 8793514b8fb7..533aaf1f9e51 100644
--- a/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
+++ b/mail-mta/exim/files/exim-4.94-CVE-2022-3559.patch
@@ -69,7 +69,7 @@ Subject: [PATCH 1/1] Fix $regex<n> use-after-free.  Bug 2915
  
  /* precompile our regexes */
  if (!(re_list_head = compile(*listptr)))
-@@ -213,3 +205,12 @@
+@@ -213,3 +205,14 @@
  }
  
  #endif /* WITH_CONTENT_SCAN */
@@ -78,7 +78,9 @@ Subject: [PATCH 1/1] Fix $regex<n> use-after-free.  Bug 2915
 +void
 +regex_vars_clear(void)
 +{
++#ifdef WITH_CONTENT_SCAN
 +regex_match_string = NULL;
++#endif
 +for (int i = 0; i < REGEX_VARS; i++) regex_vars[i] = NULL;
 +}
 +

Reply via email to