luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gregex: if JIT stack limit is reached, fall back to interpretive matching

Browse Source 
Helps: #2824
This commit is contained in:
Aleksei Rybalkin 2023-08-21 10:39:27 +00:00 committed by Philip Withnall
parent 5ffc23605c
commit 5921ea112d
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glib/gregex.c
View File

@ -484,8 +484,6 @@ translate_match_error (gint errcode)
/* not used by pcre2_match() */ /* not used by pcre2_match() */
break; break;
case PCRE2_ERROR_MATCHLIMIT: case PCRE2_ERROR_MATCHLIMIT:
case PCRE2_ERROR_JIT_STACKLIMIT:
return _("backtracking limit reached");
case PCRE2_ERROR_CALLOUT: case PCRE2_ERROR_CALLOUT:
/* callouts are not implemented */ /* callouts are not implemented */
break; break;
@ -1107,8 +1105,18 @@ g_match_info_next (GMatchInfo *match_info,
opts, opts,
match_info->match_data, match_info->match_data,
match_info->match_context); match_info->match_context);
/* if the JIT stack limit was reached, fall back to non-JIT matching in
* the next conditional statement */
if (match_info->matches == PCRE2_ERROR_JIT_STACKLIMIT)
{
g_debug ("PCRE2 JIT stack limit reached, falling back to "
"non-optimized matching.");
opts |= PCRE2_NO_JIT;
jit_status = JIT_STATUS_DISABLED;
}
} }
else
if (jit_status != JIT_STATUS_ENABLED)
{ {
match_info->matches = pcre2_match (match_info->regex->pcre_re, match_info->matches = pcre2_match (match_info->regex->pcre_re,
(PCRE2_SPTR8) match_info->string, (PCRE2_SPTR8) match_info->string,

10
glib/tests/regex.c
View File

@ -53,8 +53,9 @@
/* A random value use to mark untouched integer variables. */ /* A random value use to mark untouched integer variables. */
#define UNTOUCHED -559038737 #define UNTOUCHED -559038737
/* A length of the test string in JIT stack test */ /* Lengths of test strings in JIT stack tests */
#define TEST_STRING_LEN 20000 #define TEST_STRING_LEN 20000
#define LARGE_TEST_STRING_LEN 200000
static gint total; static gint total;
@ -2747,6 +2748,13 @@ G_GNUC_END_IGNORE_DEPRECATIONS
test_string[TEST_STRING_LEN - 1] = '\0'; test_string[TEST_STRING_LEN - 1] = '\0';
TEST_MATCH_SIMPLE ("^(?:[ \t\n]|[^[:cntrl:]])*$", test_string, 0, 0, TRUE); TEST_MATCH_SIMPLE ("^(?:[ \t\n]|[^[:cntrl:]])*$", test_string, 0, 0, TRUE);
/* Test that gregex falls back to unoptimized matching when reaching the JIT
* compiler stack limit */
char large_test_string[LARGE_TEST_STRING_LEN];
memset (large_test_string, '*', LARGE_TEST_STRING_LEN);
large_test_string[LARGE_TEST_STRING_LEN - 1] = '\0';
TEST_MATCH_SIMPLE ("^(?:[ \t\n]|[^[:cntrl:]])*$", large_test_string, 0, 0, TRUE);
/* TEST_MATCH(pattern, compile_opts, match_opts, string, /* TEST_MATCH(pattern, compile_opts, match_opts, string,
* string_len, start_position, match_opts2, expected) */ * string_len, start_position, match_opts2, expected) */
TEST_MATCH("a", 0, 0, "a", -1, 0, 0, TRUE); TEST_MATCH("a", 0, 0, "a", -1, 0, 0, TRUE);