diff options
author | nagachika <nagachika@ruby-lang.org> | 2024-01-18 11:56:43 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2024-01-18 11:56:43 +0900 |
commit | 3302e251dccec1e981945ab19d316d0856c68bf6 (patch) | |
tree | fa458f638646f154ec69413a026f511fd6ed1121 | |
parent | 5dae6eb55e9785c8329708e55a49a280a344cdc1 (diff) |
merge revision(s) e07e9f8491d9ab8b22d2bdf6a8aeba834dac7eef: [Backport #20174]
RJIT: Do nothing on jit_cont_free
if cont is NULL.
---
cont.c | 2 ++
1 file changed, 2 insertions(+)
-rw-r--r-- | cont.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1255,6 +1255,8 @@ jit_cont_new(rb_execution_context_t *ec) static void jit_cont_free(struct rb_jit_cont *cont) { + if (!cont) return; + rb_native_mutex_lock(&jit_cont_lock); if (cont == first_jit_cont) { first_jit_cont = cont->next; @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 2 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 154 +#define RUBY_PATCHLEVEL 155 #include "ruby/version.h" #include "ruby/internal/abi.h" |