From 44b3172e369435c2c1baa4e9c837252f729d2905 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 15 Feb 2024 19:56:40 +0000
Subject: [PATCH 10/10] regex: avoid releasing built RE midloop
---
src/regex.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/regex.c b/src/src/regex.c
index 642b9cf93..285ab8dbd 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -120,7 +120,6 @@ FILE * mbox_file;
pcre_list * re_list_head;
long f_pos = 0;
int ret = FAIL, cnt, lcount = REGEX_LOOPCOUNT_STORE_RESET;
-rmark reset_point;
regex_vars_clear();
@@ -144,11 +143,11 @@ else
mbox_file = mime_stream;
}
-reset_point = store_mark();
- {
/* precompile our regexes */
if ((re_list_head = compile(*listptr, cacheable, &cnt)))
{
+ rmark reset_point = store_mark();
+
/* match each line against all regexes */
while (fgets(CS big_buffer, big_buffer_size, mbox_file))
{
@@ -167,9 +166,9 @@ reset_point = store_mark();
lcount = REGEX_LOOPCOUNT_STORE_RESET;
}
}
+
+ store_reset(reset_point);
}
- }
-store_reset(reset_point);
if (!mime_stream)
(void)fclose(mbox_file);
--
2.34.1