1From 6535c77b00a444750148d9d658e4d47214bb4562 Mon Sep 17 00:00:00 2001 2From: Aleksei Rybalkin <aleksei@rybalkin.org> 3Date: Mon, 25 Jul 2022 16:48:03 +0200 4Subject: [PATCH] gregex: do not set match and recursion limits on match 5 context 6 7These are not really necessary, and cause breakages (e.g. #2700). 8pcre2_set_recursion_limit is also deprecated. 9 10Fixes: #2700 11 12Conflict:NA 13Reference:https://gitlab.gnome.org/GNOME/glib/-/commit/6535c77b00a444750148d9d658e4d47214bb4562 14 15--- 16 glib/gregex.c | 2 -- 17 glib/tests/regex.c | 3 +++ 18 2 files changed, 3 insertions(+), 2 deletions(-) 19 20diff --git a/glib/gregex.c b/glib/gregex.c 21index 6741d2479f..dd61dc4813 100644 22--- a/glib/gregex.c 23+++ b/glib/gregex.c 24@@ -769,8 +769,6 @@ match_info_new (const GRegex *regex, 25 &match_info->n_subpatterns); 26 27 match_info->match_context = pcre2_match_context_create (NULL); 28- pcre2_set_match_limit (match_info->match_context, 65536); /* should be plenty */ 29- pcre2_set_recursion_limit (match_info->match_context, 64); /* should be plenty */ 30 31 if (is_dfa) 32 { 33diff --git a/glib/tests/regex.c b/glib/tests/regex.c 34index bb1a5ff762..5839465fae 100644 35--- a/glib/tests/regex.c 36+++ b/glib/tests/regex.c 37@@ -2493,6 +2493,9 @@ main (int argc, char *argv[]) 38 TEST_MATCH("[DŽ]", G_REGEX_CASELESS, 0, "dž", -1, 0, 0, TRUE); 39 TEST_MATCH("[DŽ]", G_REGEX_CASELESS, 0, "Dž", -1, 0, 0, TRUE); 40 41+ /* see https://gitlab.gnome.org/GNOME/glib/-/issues/2700 */ 42+ TEST_MATCH("(\n.+)+", G_REGEX_DEFAULT, 0, "\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n", -1, 0, 0, TRUE); 43+ 44 /* TEST_MATCH_NEXT#(pattern, string, string_len, start_position, ...) */ 45 TEST_MATCH_NEXT0("a", "x", -1, 0); 46 TEST_MATCH_NEXT0("a", "ax", -1, 1); 47-- 48GitLab 49 50