[Commits] [SCM] claws branch, master, updated. 4.2.0-61-g163db8ed1

[wwp at claws-mail.org]

The branch, master has been updated
       via  163db8ed1457cc93f1f110f893bf932e386d94d8 (commit)
      from  de1fd9b0e2b3569cdaae2d6578c526a3f7c1880a (commit)

Summary of changes:
 src/matcher.c | 6 ------
 1 file changed, 6 deletions(-)


- Log -----------------------------------------------------------------
commit 163db8ed1457cc93f1f110f893bf932e386d94d8
Author: wwp <subscript at free.fr>
Date:   Sun Feb 25 15:49:03 2024 +0100

    Fix bug #4746: matcher: remove incorrect condition in matcherprop_free
    In fact, Regex'es have been reenabled in Windows since 2015 (Andrej, 22a32c92603ba73754af64cd3b40de3d7c2f752a)
    after they've been disabled in 2013 (Colin, 7f27738df23b2098214d956e6b41149c1a158404);
    reenable everything of their handling in matcher.[ch].

diff --git a/src/matcher.c b/src/matcher.c
index 889d460d3..32a9158bc 100644
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -320,9 +320,7 @@ MatcherProp *matcherprop_new(gint criteria, const gchar *header,
 	prop->expr = expr != NULL ? g_strdup(expr) : NULL;
 
 	prop->matchtype = matchtype;
-#ifndef G_OS_WIN32
 	prop->preg = NULL;
-#endif
 	prop->casefold_expr = NULL;
 	prop->value = value;
 	prop->error = 0;
@@ -340,13 +338,11 @@ void matcherprop_free(MatcherProp *prop)
 {
 	g_free(prop->expr);
 	g_free(prop->header);
-#ifndef G_OS_WIN32
 	if (prop->preg != NULL) {
 		regfree(prop->preg);
 		g_free(prop->preg);
 	}
 	g_free(prop->casefold_expr);
-#endif
 	g_free(prop);
 }
 
@@ -366,9 +362,7 @@ MatcherProp *matcherprop_copy(const MatcherProp *src)
 	prop->expr = src->expr ? g_strdup(src->expr) : NULL;
 	prop->matchtype = src->matchtype;
 	
-#ifndef G_OS_WIN32
 	prop->preg = NULL; /* will be re-evaluated */
-#endif
 	prop->casefold_expr = src->casefold_expr ? g_strdup(src->casefold_expr) : NULL;
 	prop->value = src->value;
 	prop->error = src->error;	

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail