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

regex: Compute the offsets size based on match results

Browse Source 
While the ovector count would include all the allocated space, we only
care about the actual match values, so avoid wasting allocations and
just use the ones we need to hold the offsets.
This commit is contained in:
Marco Trevisan (Treviño) 2022-09-06 19:05:24 +02:00
parent aee84cb45c
commit e8628a7ed5
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glib/gregex.c
View File

@ -832,10 +832,20 @@ recalc_match_offsets (GMatchInfo *match_info,
GError **error) GError **error)
{ {
PCRE2_SIZE *ovector; PCRE2_SIZE *ovector;
uint32_t ovector_size = 0;
uint32_t pre_n_offset; uint32_t pre_n_offset;
uint32_t i; uint32_t i;
if (pcre2_get_ovector_count (match_info->match_data) > G_MAXUINT32 / 2) g_assert (!IS_PCRE2_ERROR (match_info->matches));
if (match_info->matches == PCRE2_ERROR_PARTIAL)
ovector_size = 1;
else if (match_info->matches > 0)
ovector_size = match_info->matches;
g_assert (ovector_size != 0);
if (pcre2_get_ovector_count (match_info->match_data) < ovector_size)
{ {
g_set_error (error, G_REGEX_ERROR, G_REGEX_ERROR_MATCH, g_set_error (error, G_REGEX_ERROR, G_REGEX_ERROR_MATCH,
_("Error while matching regular expression %s: %s"), _("Error while matching regular expression %s: %s"),
@ -844,7 +854,7 @@ recalc_match_offsets (GMatchInfo *match_info,
} }
pre_n_offset = match_info->n_offsets; pre_n_offset = match_info->n_offsets;
match_info->n_offsets = pcre2_get_ovector_count (match_info->match_data) * 2; match_info->n_offsets = ovector_size * 2;
ovector = pcre2_get_ovector_pointer (match_info->match_data); ovector = pcre2_get_ovector_pointer (match_info->match_data);
if (match_info->n_offsets != pre_n_offset) if (match_info->n_offsets != pre_n_offset)
@ -2387,7 +2397,7 @@ g_regex_match_all_full (const GRegex *regex,
_("Error while matching regular expression %s: %s"), _("Error while matching regular expression %s: %s"),
regex->pattern, match_error (info->matches)); regex->pattern, match_error (info->matches));
} }
else if (info->matches > 0) else if (info->matches != PCRE2_ERROR_NOMATCH)
{ {
if (!recalc_match_offsets (info, error)) if (!recalc_match_offsets (info, error))
info->matches = PCRE2_ERROR_NOMATCH; info->matches = PCRE2_ERROR_NOMATCH;