mirror/perl
1
0
Fork 0
mirror of https://github.com/Perl/perl5.git synced 2026-01-26 16:39:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

regcomp: ensure the RExC_state freed earlier rather than later

Browse Source 
388bf71 (ignoring #23022 for now) ensured that the RExC_state
and its controlled pointers were freed once and only once,
regardless of whether re_op_compile() returned normally or threw
an exception.

Unfortunately that free could happen very later, surviving well beyond
when the regexp was compiled.

Add an ENTER/LEAVE pair to ensure the cleanup is done immediately
on a normal return.
This commit is contained in:
Tony Cook 2025-04-14 10:46:13 +10:00 committed by mauke
parent fef3a42e53
commit 349f8f5bca
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
regcomp.c
View File

@ -1481,6 +1481,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
* or error. */
Newxz(pRExC_state, 1, RExC_state_t);
ENTER_with_name("re_op_compile");
SAVE_FREE_REXC_STATE(pRExC_state);
DEBUG_r({
@ -1578,6 +1579,8 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
"Precompiled pattern%s\n",
orig_rx_flags & RXf_SPLIT ? " for split" : ""));
LEAVE_with_name("re_op_compile");
return (REGEXP*)re;
}
}
@ -1593,7 +1596,9 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
pat = newSVpvn_flags(exp, plen, SVs_TEMP |
(IN_BYTES ? 0 : SvUTF8(pat)));
}
return CALLREGCOMP_ENG(eng, pat, orig_rx_flags);
REGEXP *re = CALLREGCOMP_ENG(eng, pat, orig_rx_flags);
LEAVE_with_name("re_op_compile");
return re;
}
/* ignore the utf8ness if the pattern is 0 length */
@ -1643,6 +1648,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
Perl_re_printf( aTHX_ "%sSkipping recompilation of unchanged REx%s %s\n",
PL_colors[4], PL_colors[5], s);
});
LEAVE_with_name("re_op_compile");
return old_re;
}
@ -2477,6 +2483,7 @@ Perl_re_op_compile(pTHX_ SV ** const patternp, int pat_count,
if (old_re && SvREADONLY(old_re))
SvREADONLY_on(Rx);
#endif
LEAVE_with_name("re_op_compile");
return Rx;
}