From c0df0a85dec77a09308caddb1e1efd4d38fbf7b8 Mon Sep 17 00:00:00 2001 From: "NARUSE, Yui" Date: Fri, 20 Jan 2023 17:01:47 +0900 Subject: [PATCH] merge revision(s) ed6fbb79e19bf401db0e85447fee955fd10a25c7: [Backport #19339] Fix crash when defining ivars on special constants [Bug #19339] --- test/ruby/test_variable.rb | 6 ++++++ vm_insnhelper.c | 5 +++++ 2 files changed, 11 insertions(+) --- test/ruby/test_variable.rb | 6 ++++++ version.h | 2 +- vm_insnhelper.c | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/test/ruby/test_variable.rb b/test/ruby/test_variable.rb index f8a7c68fd3..9acba39f40 100644 --- a/test/ruby/test_variable.rb +++ b/test/ruby/test_variable.rb @@ -261,6 +261,12 @@ class TestVariable < Test::Unit::TestCase v.instance_variable_set(:@foo, :bar) end + assert_raise_with_message(FrozenError, msg, "[Bug #19339]") do + v.instance_eval do + @a = 1 + end + end + assert_nil EnvUtil.suppress_warning {v.instance_variable_get(:@foo)} assert_not_send([v, :instance_variable_defined?, :@foo]) diff --git a/version.h b/version.h index 56209ed45e..efbaf03c7d 100644 --- a/version.h +++ b/version.h @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 16 +#define RUBY_PATCHLEVEL 17 #include "ruby/version.h" #include "ruby/internal/abi.h" diff --git a/vm_insnhelper.c b/vm_insnhelper.c index aa5e565f10..f9b91a0102 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -1562,6 +1562,11 @@ vm_getinstancevariable(const rb_iseq_t *iseq, VALUE obj, ID id, IVC ic) static inline void vm_setinstancevariable(const rb_iseq_t *iseq, VALUE obj, ID id, VALUE val, IVC ic) { + if (RB_SPECIAL_CONST_P(obj)) { + rb_error_frozen_object(obj); + return; + } + shape_id_t dest_shape_id; attr_index_t index; vm_ic_atomic_shape_and_index(ic, &dest_shape_id, &index);