From 14510521720231dd9f07d949c86c9df9c52b205b Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 23 Apr 2024 19:23:09 +0900 Subject: merge revision(s) 989a2355808a63fc45367785c82ffd46d18c900a: Fix Use-After-Free issue for Regexp Co-authored-by: Isaac Peka <7493006+isaac-peka@users.noreply.github.com> --- regexec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- regexec.c | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/regexec.c b/regexec.c index a8aa555895..07900deeb2 100644 --- a/regexec.c +++ b/regexec.c @@ -2528,8 +2528,8 @@ match_at(regex_t* reg, const UChar* str, const UChar* end, CASE(OP_MEMORY_END_PUSH_REC) MOP_IN(OP_MEMORY_END_PUSH_REC); GET_MEMNUM_INC(mem, p); STACK_GET_MEM_START(mem, stkp); /* should be before push mem-end. */ - STACK_PUSH_MEM_END(mem, s); mem_start_stk[mem] = GET_STACK_INDEX(stkp); + STACK_PUSH_MEM_END(mem, s); MOP_OUT; JUMP; diff --git a/version.h b/version.h index 565dbef60b..20e5c6748a 100644 --- a/version.h +++ b/version.h @@ -12,7 +12,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 218 +#define RUBY_PATCHLEVEL 219 #define RUBY_RELEASE_YEAR 2024 #define RUBY_RELEASE_MONTH 4 -- cgit v1.2.3