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

gregex: Avoid re-allocating if we have no size change

Browse Source 
This is handled by the syscall underneath, but we can just avoid a call
cheaply.
This commit is contained in:
Marco Trevisan (Treviño) 2022-09-06 18:56:39 +02:00
parent 11521972f4
commit aee84cb45c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/gregex.c
View File

@ -832,6 +832,7 @@ recalc_match_offsets (GMatchInfo *match_info,
GError **error) GError **error)
{ {
PCRE2_SIZE *ovector; PCRE2_SIZE *ovector;
uint32_t pre_n_offset;
uint32_t i; uint32_t i;
if (pcre2_get_ovector_count (match_info->match_data) > G_MAXUINT32 / 2) if (pcre2_get_ovector_count (match_info->match_data) > G_MAXUINT32 / 2)
@ -842,11 +843,17 @@ recalc_match_offsets (GMatchInfo *match_info,
return FALSE; return FALSE;
} }
pre_n_offset = match_info->n_offsets;
match_info->n_offsets = pcre2_get_ovector_count (match_info->match_data) * 2; match_info->n_offsets = pcre2_get_ovector_count (match_info->match_data) * 2;
ovector = pcre2_get_ovector_pointer (match_info->match_data); ovector = pcre2_get_ovector_pointer (match_info->match_data);
match_info->offsets = g_realloc_n (match_info->offsets,
match_info->n_offsets, if (match_info->n_offsets != pre_n_offset)
sizeof (gint)); {
match_info->offsets = g_realloc_n (match_info->offsets,
match_info->n_offsets,
sizeof (gint));
}
for (i = 0; i < match_info->n_offsets; i++) for (i = 0; i < match_info->n_offsets; i++)
{ {
match_info->offsets[i] = (int) ovector[i]; match_info->offsets[i] = (int) ovector[i];