summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2024-04-23 19:18:14 +0900
committernagachika <nagachika@ruby-lang.org>2024-04-23 19:18:14 +0900
commit90b194b5e3fe793c1ed895a4522675845181e6fd (patch)
treed230850bfa86f768c621ea16fa830f896840fffd
parent404f1e215a1707b31edba36f9f07a82367960618 (diff)
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(-)
-rw-r--r--regexec.c2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/regexec.c b/regexec.c
index 9bed2d87bc..06047d3045 100644
--- a/regexec.c
+++ b/regexec.c
@@ -3195,8 +3195,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 6371ebeece..1b69188736 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 3
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 168
+#define RUBY_PATCHLEVEL 169
#include "ruby/version.h"
#include "ruby/internal/abi.h"